Extended fPIC patch to C++ wrappers; otherwise packages that use the netcdf library to generate shared objects create text relocations (e.g. media-gfx/kst).

Package-Manager: portage-2.1.2_pre3-r7

5 files changed, 124 insertions, 5 deletions

diff --git a/sci-libs/netcdf/ChangeLog b/sci-libs/netcdf/ChangeLog
index db727521803a..13cae1fb5c90 100644
--- a/sci-libs/netcdf/ChangeLog
+++ b/sci-libs/netcdf/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sci-libs/netcdf
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/netcdf/ChangeLog,v 1.31 2006/09/08 17:57:43 tcort Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/netcdf/ChangeLog,v 1.32 2006/10/24 12:31:31 markusle Exp $
+
+*netcdf-3.6.1-r1 (22 Oct 2006)
+
+  22 Oct 2006; Markus Dittrich <markusle@gentoo.org> +files/fPIC.1.patch,
+  +netcdf-3.6.1-r1.ebuild:
+  Extended fPIC patch to C++ wrappers; otherwise packages that use 
+  the netcdf library to generate shared objects create text 
+  relocations (e.g. media-gfx/kst).
 
   08 Sep 2006; Thomas Cort <tcort@gentoo.org> netcdf-3.6.1.ebuild:
   Stable on alpha wrt Bug #82431.
diff --git a/sci-libs/netcdf/Manifest b/sci-libs/netcdf/Manifest
index 75f2b9d1aef4..32fb90387722 100644
--- a/sci-libs/netcdf/Manifest
+++ b/sci-libs/netcdf/Manifest
@@ -1,3 +1,7 @@
+AUX fPIC.1.patch 816 RMD160 4640831dac116428fc1b7bb80a27a0c3ad59cc15 SHA1 3ed50725c51c66cdbf769b2214d0e2be9d4aa850 SHA256 d5f9431b102815c5000fb2a97536d5a74aa1c83acbc1df11e5ad9716f9623501
+MD5 da36efc15fffb2c79992752200446dce files/fPIC.1.patch 816
+RMD160 4640831dac116428fc1b7bb80a27a0c3ad59cc15 files/fPIC.1.patch 816
+SHA256 d5f9431b102815c5000fb2a97536d5a74aa1c83acbc1df11e5ad9716f9623501 files/fPIC.1.patch 816
 AUX fPIC.patch 209 RMD160 f7336b30c070a75335bed8280e5f1505a03ce464 SHA1 c5e8728952dc9eace71417936e93b7ee5c415e98 SHA256 7c24234fdc8b9f4031989949398aa203aafd492d367d71c02e1ce41b5b39d68c
 MD5 46a9de0130f415c3cff34812e9ce6724 files/fPIC.patch 209
 RMD160 f7336b30c070a75335bed8280e5f1505a03ce464 files/fPIC.patch 209
@@ -17,14 +21,18 @@ EBUILD netcdf-3.6.0-r1.ebuild 1136 RMD160 bfbbb8f04db3033a70f7a9e478c2369bb6188e
 MD5 290f2787fee3e3b4ba4af62e2e2f328b netcdf-3.6.0-r1.ebuild 1136
 RMD160 bfbbb8f04db3033a70f7a9e478c2369bb6188edb netcdf-3.6.0-r1.ebuild 1136
 SHA256 b0f9ceced4b810c4562325009706d3ace2b70dc3aca36bb5b578e83814c4faab netcdf-3.6.0-r1.ebuild 1136
+EBUILD netcdf-3.6.1-r1.ebuild 1948 RMD160 7581969ac90b3ef46cf3711fa6825a0066b38bde SHA1 af95653a263362f83b15510a76f949590d2bec75 SHA256 4bbf3b7d62e2ccbf0b435f7b8282bd7614a52b0703bf9dab407ace31e133a8cc
+MD5 68fec7223ea2e66e25943b642f205dad netcdf-3.6.1-r1.ebuild 1948
+RMD160 7581969ac90b3ef46cf3711fa6825a0066b38bde netcdf-3.6.1-r1.ebuild 1948
+SHA256 4bbf3b7d62e2ccbf0b435f7b8282bd7614a52b0703bf9dab407ace31e133a8cc netcdf-3.6.1-r1.ebuild 1948
 EBUILD netcdf-3.6.1.ebuild 1932 RMD160 281ab589d135ac62c4881c4f4ea7f39c39828a47 SHA1 95a1519ed350d9dc7924a6043f4ffd03c885db7f SHA256 22d73c9434ed09b0a060767bcd42097cc568fbcb4809d57defc37d98711a84a8
 MD5 4d5d4637ad171403872323fe26ab0197 netcdf-3.6.1.ebuild 1932
 RMD160 281ab589d135ac62c4881c4f4ea7f39c39828a47 netcdf-3.6.1.ebuild 1932
 SHA256 22d73c9434ed09b0a060767bcd42097cc568fbcb4809d57defc37d98711a84a8 netcdf-3.6.1.ebuild 1932
-MISC ChangeLog 7264 RMD160 08e101abd3398d8bc86e6fb85a4b8148f03ee0cb SHA1 fd98ce79ed83db1629d14eb587395b70d4cc09eb SHA256 b699696066a8478178d815175d3de7ed6b20311a1f03795a09dcb757ad0acb35
-MD5 9a5950eb338f52802910ed07166d2025 ChangeLog 7264
-RMD160 08e101abd3398d8bc86e6fb85a4b8148f03ee0cb ChangeLog 7264
-SHA256 b699696066a8478178d815175d3de7ed6b20311a1f03795a09dcb757ad0acb35 ChangeLog 7264
+MISC ChangeLog 7566 RMD160 516f4761c45f559b53e05938e36521997d33c324 SHA1 289c45ec3d6e492a1aefe17f2381b294133f88d4 SHA256 ce84151bcbf803f57516e3d130e0dfbdfbc8e064f1912c5006b0345dfa7747fa
+MD5 89321ea7056ad5a7af511a25d374e7f7 ChangeLog 7566
+RMD160 516f4761c45f559b53e05938e36521997d33c324 ChangeLog 7566
+SHA256 ce84151bcbf803f57516e3d130e0dfbdfbc8e064f1912c5006b0345dfa7747fa ChangeLog 7566
 MISC metadata.xml 354 RMD160 bfcb0f7b337f66dc2fb62553362bf7f5090f7ab5 SHA1 048f97a1a58422edf97c4acc7c29323467118b08 SHA256 053eca00f9a0520f832d4569dd97c2645393a87a512af39ffb23bc0f59078fe4
 MD5 a90354cea7ea5a1ccb093598a750c7c6 metadata.xml 354
 RMD160 bfcb0f7b337f66dc2fb62553362bf7f5090f7ab5 metadata.xml 354
@@ -38,3 +46,6 @@ SHA256 c70d6c6ddff5b9a6d17980ce22519f1e2b31f6a0d70db5881220e07910f5204d files/di
 MD5 aadb37991539590d3976082a9b2bf476 files/digest-netcdf-3.6.1 238
 RMD160 657662424942042a437aa01ed81f26392709573a files/digest-netcdf-3.6.1 238
 SHA256 9494146ba09f3753dad7e578aff473f639fa38c84759738e00abc13782047bc3 files/digest-netcdf-3.6.1 238
+MD5 aadb37991539590d3976082a9b2bf476 files/digest-netcdf-3.6.1-r1 238
+RMD160 657662424942042a437aa01ed81f26392709573a files/digest-netcdf-3.6.1-r1 238
+SHA256 9494146ba09f3753dad7e578aff473f639fa38c84759738e00abc13782047bc3 files/digest-netcdf-3.6.1-r1 238
diff --git a/sci-libs/netcdf/files/digest-netcdf-3.6.1-r1 b/sci-libs/netcdf/files/digest-netcdf-3.6.1-r1
new file mode 100644
index 000000000000..50e674c42d18
--- /dev/null
+++ b/sci-libs/netcdf/files/digest-netcdf-3.6.1-r1
@@ -0,0 +1,3 @@
+MD5 07a9db424337c5e4833fb84136e09a1e netcdf-3.6.1.tar.gz 883888
+RMD160 f46c3f65645169db60c8523eb28d498dfb6f7760 netcdf-3.6.1.tar.gz 883888
+SHA256 15c42a2c698c4e42ee17720701168711d86e97e97311223015d07853fb09249f netcdf-3.6.1.tar.gz 883888
diff --git a/sci-libs/netcdf/files/fPIC.1.patch b/sci-libs/netcdf/files/fPIC.1.patch
new file mode 100644
index 000000000000..cc4b4d8b7435
--- /dev/null
+++ b/sci-libs/netcdf/files/fPIC.1.patch
@@ -0,0 +1,24 @@
+diff -Naur netcdf-3.6.1/src/cxx/Makefile netcdf-3.6.1-new/src/cxx/Makefile
+--- netcdf-3.6.1/src/cxx/Makefile	2006-01-26 15:13:44.000000000 -0500
++++ netcdf-3.6.1-new/src/cxx/Makefile	2006-10-22 18:41:18.000000000 -0400
+@@ -11,6 +11,8 @@
+ 		  nctst.cpp ncvalues.cpp ncvalues.h netcdf.cpp netcdfcpp.h \
+ 		  netcdf.hh install-sh ref_nctst.cdl ref_nctst_64bit_offset.cdl
+ 
++CXXFLAGS += -fPIC
++
+ LIBRARY		= libnetcdf_c++.a
+ lib_netcdf	= ../libsrc/libnetcdf.a
+ ld_netcdf	= -L../libsrc -lnetcdf
+diff -Naur netcdf-3.6.1/src/libsrc/Makefile netcdf-3.6.1-new/src/libsrc/Makefile
+--- netcdf-3.6.1/src/libsrc/Makefile	2005-02-17 11:15:11.000000000 -0500
++++ netcdf-3.6.1-new/src/libsrc/Makefile	2006-10-22 18:40:36.000000000 -0400
+@@ -14,6 +14,8 @@
+ 
+ MANUAL	= netcdf.3
+ 
++CFLAGS += -fPIC
++
+ LIB_CSRCS = \
+ 	attr.c \
+ 	dim.c \
diff --git a/sci-libs/netcdf/netcdf-3.6.1-r1.ebuild b/sci-libs/netcdf/netcdf-3.6.1-r1.ebuild
new file mode 100644
index 000000000000..4b4bb12a938c
--- /dev/null
+++ b/sci-libs/netcdf/netcdf-3.6.1-r1.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/netcdf/netcdf-3.6.1-r1.ebuild,v 1.1 2006/10/24 12:31:31 markusle Exp $
+
+inherit fortran eutils toolchain-funcs
+
+DESCRIPTION="Scientific library and interface for array oriented data access"
+SRC_URI="ftp://ftp.unidata.ucar.edu/pub/netcdf/${P}.tar.gz"
+HOMEPAGE="http://my.unidata.ucar.edu/content/software/netcdf/index.html"
+
+LICENSE="UCAR-Unidata"
+SLOT="0"
+IUSE="fortran"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+
+S="${WORKDIR}/${P}/src"
+
+pkg_setup() {
+	if use fortran ; then
+	    need_fortran "gfortran ifc g77"
+#	    fortran_pkg_setup
+	else
+	    FORTRAN=""
+	fi
+}
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch "${FILESDIR}"/fPIC.1.patch || die "fPIC patch failed"
+}
+
+src_compile() {
+	local myconf
+
+	if use fortran ; then
+	    if [ ${FORTRANC} == gfortran ] ; then
+		myconf="${myconf} CPPFLAGS=-DpgiFortran"
+	    else
+		myconf="${myconf} CPPFLAGS=-Df2cFortran"
+	    fi
+	fi
+
+	econf ${myconf} || die "econf failed"
+
+	make || die "make failed"
+}
+
+src_test() {
+	make test || die "make test failed"
+}
+
+src_install() {
+	dodir /usr/{lib,share} /usr/share/man/man3
+
+	einstall MANDIR=${D}usr/share/man || die "einstall failed"
+
+	if test -f ${D}usr/share/man/man3/netcdf.3f ; then
+	    dodir /usr/share/man/man3f
+	    mv ${D}usr/share/man/man3/netcdf.3f ${D}usr/share/man/man3f/ \
+		|| die "Failed to move f77 man page"
+	    dosed "s:NETCDF 3:NETCDF 3F:g" /usr/share/man/man3f/netcdf.3f \
+		|| die "dosed failed"
+	    if test -f ${D}usr/share/man/man3/netcdf.3f90 ; then
+		dodir /usr/share/man/man3f90
+		mv ${D}usr/share/man/man3/netcdf.3f90 ${D}usr/share/man/man3f90/ \
+		    || die "Failed to move f90 man page"
+	    fi
+	    dodoc fortran/cfortran.doc || die "Failed to install fortran docs"
+	fi
+
+	dodoc COPYRIGHT README RELEASE_NOTES VERSION \
+		|| die "Failed to install docs"
+}