Actually respect the user's compiler and CFLAGS. Build libpvm3.a PIC so that other apps can link against it on architectures such as amd64.

Package-Manager: portage-2.1.4.4

4 files changed, 139 insertions, 2 deletions

diff --git a/sys-cluster/pvm/ChangeLog b/sys-cluster/pvm/ChangeLog
index f7a17914fe04..68ae81d11699 100644
--- a/sys-cluster/pvm/ChangeLog
+++ b/sys-cluster/pvm/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-cluster/pvm
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/pvm/ChangeLog,v 1.36 2008/01/31 07:01:18 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/pvm/ChangeLog,v 1.37 2008/03/24 19:45:24 dberkholz Exp $
+
+*pvm-3.4.5-r3 (24 Mar 2008)
+
+  24 Mar 2008; Donnie Berkholz <dberkholz@gentoo.org>;
+  +files/pvm-3.4.5-respect-cflags.patch, +pvm-3.4.5-r3.ebuild:
+  Actually respect the user's compiler and CFLAGS. Build libpvm3.a PIC so
+  that other apps can link against it on architectures such as amd64.
 
   31 Jan 2008; Donnie Berkholz <dberkholz@gentoo.org>; -pvm-3.4.4-r2.ebuild:
   Clean up.
diff --git a/sys-cluster/pvm/Manifest b/sys-cluster/pvm/Manifest
index 248a55d6f523..c1332326c62b 100644
--- a/sys-cluster/pvm/Manifest
+++ b/sys-cluster/pvm/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX pvm-3.4.4-gentoo.diff 608 RMD160 f1feb78bbe0ed61edd6be711f707ee170fd5b975 SHA1 c91e16676e8e408d932a4f387bcb416f573d03a3 SHA256 5f5d997f58be78e1d12bb0b9db4376bc8cf3113078c00a0eaa890a60e63bb382
 AUX pvm-3.4.4-s390.patch 886 RMD160 b3c8f8403e2ad0f15f959753e9a4c1f62934359f SHA1 dc6b2d0a80dac364e3d65f087092b52bf8a7f38b SHA256 0fe66d01eb9116d2e359ff66c9b0a3ddb164883031318d7334a445ba466ade71
 AUX pvm-3.4.4-x86_64-segfault.patch 2478 RMD160 312ffa58795b1a4fe1589070972131cd2e40b5f2 SHA1 410147e32f181e3c4f093a69370b49359b534ba4 SHA256 5b9bf5f697959ce861075ae8ae689cc7c291e350921df744bd6b4f8fa85fafd7
@@ -6,6 +9,7 @@ AUX pvm-3.4.5-envvars.patch 732 RMD160 57c0e8b37c4255dea33ae940fd287e0adaa406ae
 AUX pvm-3.4.5-extra-arches.patch 547 RMD160 70838f00475ac8348ce5aca13b895c426f67151b SHA1 688e109bd071e6527b6f50a7a7599f4708a692ab SHA256 81b3e490bea752c38f8ff9573149f24a1c26793541614091836e117d8718aa70
 AUX pvm-3.4.5-gcc-4.1.patch 2196 RMD160 b1e605b6155556768d9bb65d738247ae5132fa07 SHA1 c559cbe9b1217f32ab967e0b27d704abe156a792 SHA256 cc8588444eedbdcddbec1356c766b575dd62b89216e58e44df08169ce0299e5e
 AUX pvm-3.4.5-ppc64.patch 498 RMD160 15ba5593be98996c9660ea564612d659a343c348 SHA1 ee9d4ee4e810b764b1b797400286896110ca1d53 SHA256 d62fa31b5934970cb3570e86fac93bb3cbe347f55a72e0230dcd04b0d2d85dba
+AUX pvm-3.4.5-respect-cflags.patch 368 RMD160 41a44c8f7f918851a24e1539675a4ad5ee063c8d SHA1 70090c669ad4c9037ba179be5d0528f50c2b0339 SHA256 13c77955f16cdba0ee7784d69795d895fa57e3444addd0a965c144ed6eabffcd
 AUX pvm-3.4.5-strerror.patch 5403 RMD160 69b33a6af4d8367ddcf1f91137d58debc414cb42 SHA1 7065ce9d54159b8fe0c2d06e4e9a1ec130c53b64 SHA256 44630dcf199970140065c810511e88bc7aa9be1948d7a2b7d6c5d776f8199ca1
 AUX pvm-3.4.5-x86_64-segfault.patch 1233 RMD160 e4e7928de71df9ead05408be48d3d3a5e7d31d7c SHA1 0941f700f46194cffbd20dd70da29ae33a073ca1 SHA256 bb6adf33cdf713fce4713d2148aae551cc389a9e889695d294fb648eea20e923
 DIST pvm3.4.4.tgz 967852 RMD160 12e1efa58ffd9ad380ca036910d389a21e925c94 SHA1 95bfabee61383fe2223ee2f539129bb54b5afb40 SHA256 309643786738d2620bc0031201e4c77c5e6d595fdeb074acbf80926accf9ead5
@@ -13,5 +17,13 @@ DIST pvm3.4.5.tgz 979201 RMD160 22244c42a964d74ada43fb1379d7b4179afc7f9e SHA1 c1
 EBUILD pvm-3.4.4-r1.ebuild 1111 RMD160 b3a0a5afa6e018a2d63e30e2c721d55f4951e3a9 SHA1 33e0729f38b30e6a7ecfb3c558d916e078b6bf51 SHA256 b4ab01ad1ba864294c6f56b2d6b26bf56798789114fa6e4516e84aaf2c977e24
 EBUILD pvm-3.4.4-r3.ebuild 1959 RMD160 76b475c4f9e4c85c7e9913d4a91af9c6046e8134 SHA1 a375d0d6bc29e43a0c727a9c4a0bc8a362dd1721 SHA256 21f217afef6a6ef641b96c66ff12b9279ba9d8a96b386f43c1d0d8f8c533996d
 EBUILD pvm-3.4.5-r2.ebuild 2589 RMD160 20cf3abed839d3ccaff47d129899846730898543 SHA1 a25ff75e83e1a5dc388fb5613b2d53d010df85cb SHA256 b34602fbc099d0792e3b39f212512c134fd057a8b8ec3f98cc1b5039fe0e0ea2
-MISC ChangeLog 5112 RMD160 e1056d56f74a4e9de24810022c6ef941c4aef169 SHA1 b02d56414ac7a01259007cd6e0037ec9bf7ebb98 SHA256 028eb18dea6c1a94f2e8aa72df135f9ae05753306c9af3c44b67a8e13319135a
+EBUILD pvm-3.4.5-r3.ebuild 2939 RMD160 ec64a3e1563e2d73c264f6c36b6444facf6cda9e SHA1 6b398560b14712f0c41909a34c57de276926d777 SHA256 dae6f1ae5a235b9cd3d0f202b2c9d40c2340bb6d95e75cd0c4dfc849d378b50c
+MISC ChangeLog 5404 RMD160 e7ce2c73d6a689c4bee5681c56719f3d1261aeb5 SHA1 c4df35bcc6d8674dfed41cf48fbd6e5148fb77b0 SHA256 df934ab2592d193ace45cc7e9fe9f19091a611e19f44f62e48ff1b2da6d7d175
 MISC metadata.xml 315 RMD160 12fe02dce4baa2046922f5865314c98555bd4132 SHA1 14bfa132c839c12f26e4ac1106227d2303c69e43 SHA256 d95f6835d819d4bf1bb74ac46c8259d1db23b0cfb8cd49a2a436b601f8953bd5
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFH6ATcXVaO67S1rtsRAnRvAJ99Xo7p9kSiG7E7BUSX3SMUZYTLdACgvE1+
+W4ilkTqVUiDd4Z7IVTZw/oE=
+=H/P2
+-----END PGP SIGNATURE-----
diff --git a/sys-cluster/pvm/files/pvm-3.4.5-respect-cflags.patch b/sys-cluster/pvm/files/pvm-3.4.5-respect-cflags.patch
new file mode 100644
index 000000000000..31ba5e33e12c
--- /dev/null
+++ b/sys-cluster/pvm/files/pvm-3.4.5-respect-cflags.patch
@@ -0,0 +1,15 @@
+diff -ur pvm3.orig/Makefile.aimk pvm3/Makefile.aimk
+--- pvm3.orig/Makefile.aimk	2008-03-24 12:37:29.000000000 -0700
++++ pvm3/Makefile.aimk	2008-03-24 12:37:42.000000000 -0700
+@@ -34,9 +34,9 @@
+ #
+ 
+ PVMOPTS		=	CC="$(CC)" \
+-				F77="$(F77)"
++				F77="$(F77)" \
++				CFLOPTS="$(CFLOPTS)"
+ 
+-#				CFLOPTS="$(CFLOPTS)"
+ #				FFLOPTS="$(FFLOPTS)"
+ #				PVMDIR=$(PVMDIR)
+ 
diff --git a/sys-cluster/pvm/pvm-3.4.5-r3.ebuild b/sys-cluster/pvm/pvm-3.4.5-r3.ebuild
new file mode 100644
index 000000000000..7a13f2976586
--- /dev/null
+++ b/sys-cluster/pvm/pvm-3.4.5-r3.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/pvm/pvm-3.4.5-r3.ebuild,v 1.1 2008/03/24 19:45:24 dberkholz Exp $
+
+inherit eutils multilib flag-o-matic toolchain-funcs
+
+MY_P="${P/-}"
+DESCRIPTION="PVM: Parallel Virtual Machine"
+HOMEPAGE="http://www.epm.ornl.gov/pvm/pvm_home.html"
+SRC_URI="ftp://ftp.netlib.org/pvm3/${MY_P}.tgz "
+IUSE="crypt"
+DEPEND=""
+RDEPEND="virtual/libc"
+SLOT="0"
+LICENSE="as-is"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+S="${WORKDIR}/${MY_P%%.*}"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	# Patches from Red Hat
+	epatch ${FILESDIR}/${P}-envvars.patch || die
+	epatch ${FILESDIR}/${P}-strerror.patch || die
+	epatch ${FILESDIR}/${P}-extra-arches.patch || die
+	epatch ${FILESDIR}/${P}-x86_64-segfault.patch || die
+	epatch ${FILESDIR}/${P}-gcc-4.1.patch || die
+	epatch ${FILESDIR}/${P}-bug_147337.patch || die
+
+# setup def files for other archs
+	cp conf/LINUX64.def conf/LINUXPPC64.def
+	cp conf/LINUX64.m4 conf/LINUXPPC64.m4
+
+	epatch ${FILESDIR}/${P}-ppc64.patch || die
+	epatch ${FILESDIR}/${P}-respect-cflags.patch || die
+
+# s390 should go in this list if there is ever interest
+# Patch the 64bit def files to look in lib64 dirs as well for libraries.
+	for I in 64 PPC64; do
+		sed -i -e "s|ARCHDLIB	=|ARCHDLIB	= -L/usr/lib64 -L/usr/X11R6/lib64 |" conf/LINUX${I}.def || die "Failed to fix 64-bit"
+		sed -i -e "s|ARCHLIB	=|ARCHLIB	= -L/usr/lib64 -L/usr/X11R6/lib64 |" conf/LINUX${I}.def || die "Failed to fix 64-bit"
+	done
+
+	if use crypt; then
+		for i in ${S}/conf/LINUX*def; do
+			sed -i.orig -e '/^ARCHCFLAGS/s~/usr/bin/rsh~/usr/bin/ssh~' "${i}" ||
+			die "Failed to set ssh instead of rsh"
+		done
+	fi
+
+}
+
+src_compile() {
+	unset PVM_ARCH
+
+	export PVM_ROOT="${S}"
+
+	# libpvm3.a needs to be PIC so other apps can link against it. The 
+	# build system sucks, so it's a huge pain to try to make only the 
+	# library PIC.
+	if [[ $(get_libdir) = lib64 ]]; then
+		append-flags -fPIC
+	fi
+
+	emake \
+		CC=$(tc-getCC) \
+		CFLOPTS="${CFLAGS}" \
+		|| die
+}
+
+src_install() {
+	dodir /usr/share/man
+	rm man/man1 -fr
+	mv man/man3 ${D}/usr/share/man/
+
+	dodoc Readme
+
+	#installs the rest of pvm
+	dodir /usr/share/pvm3
+	cp -r * ${D}/usr/share/pvm3
+	dodir /usr/bin
+
+	# (#132711) Symlink to the right spot on multilib systems
+	local linuxdir
+	if [[ $(get_libdir) = lib64 ]]; then
+		linuxdir="LINUX64"
+	else
+		linuxdir="LINUX"
+	fi
+	ln -s /usr/share/pvm3/lib/${linuxdir}/pvm ${D}/usr/bin/pvm
+	ln -s /usr/share/pvm3/lib/${linuxdir}/pvmd3 ${D}/usr/bin/pvmd3
+	ln -s /usr/share/pvm3/lib/${linuxdir}/pvmgs ${D}/usr/bin/pvmgs
+
+	#environment variables:
+	echo PVM_ROOT=/usr/share/pvm3 > ${T}/98pvm
+	echo PVM_ARCH=$(${D}/usr/share/pvm3/lib/pvmgetarch) >> ${T}/98pvm
+	doenvd ${T}/98pvm
+}
+
+pkg_postinst() {
+	ewarn "Environment variables have changed. Do not forget to run etc-update,"
+	ewarn "reboot or perform . /etc/profile before using pvm!"
+}