Fix for gcc4 from SuSE.

Package-Manager: portage-2.1.2_pre1-r2

4 files changed, 45 insertions, 11 deletions

diff --git a/sys-cluster/openpbs/ChangeLog b/sys-cluster/openpbs/ChangeLog
index b36053e31178..69b799e42897 100644
--- a/sys-cluster/openpbs/ChangeLog
+++ b/sys-cluster/openpbs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-cluster/openpbs
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/openpbs/ChangeLog,v 1.27 2006/09/25 03:05:07 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/openpbs/ChangeLog,v 1.28 2006/09/25 17:25:32 dberkholz Exp $
+
+  25 Sep 2006; Donnie Berkholz <dberkholz@gentoo.org>;
+  +files/2.3.16-gcc4.patch, openpbs-2.3.16-r3.ebuild:
+  Fix for gcc4 from SuSE.
 
   25 Sep 2006; Donnie Berkholz <dberkholz@gentoo.org>;
   openpbs-2.3.16-r3.ebuild:
diff --git a/sys-cluster/openpbs/Manifest b/sys-cluster/openpbs/Manifest
index eba255c0850e..5c61369e4aef 100644
--- a/sys-cluster/openpbs/Manifest
+++ b/sys-cluster/openpbs/Manifest
@@ -1,3 +1,7 @@
+AUX 2.3.16-gcc4.patch 822 RMD160 328e92ce1f355e2a32a9e3abf683cabcf21849c7 SHA1 578d7f96106db94198778e69f29aa0bce00e5e68 SHA256 f85c4ef6c1f431def71c0bfe4b2c5315df9832594bdb7d0b3f20aecee176a2c4
+MD5 4b1ff03e89b7a66a086685f0d7294aae files/2.3.16-gcc4.patch 822
+RMD160 328e92ce1f355e2a32a9e3abf683cabcf21849c7 files/2.3.16-gcc4.patch 822
+SHA256 f85c4ef6c1f431def71c0bfe4b2c5315df9832594bdb7d0b3f20aecee176a2c4 files/2.3.16-gcc4.patch 822
 AUX makedepend-sh-gcc3.patch 549 RMD160 bcff0abded43438d372456ba98ddc44fc78c3bc0 SHA1 230f61533afc709665205c2ec19ad21fe5123f55 SHA256 867dc5746edbd2a7d4dc6ae81336276ed2ba508f358dee6fb83c32b949f1493e
 MD5 26475a5f76dd888dfbc3b5fa49f7238a files/makedepend-sh-gcc3.patch 549
 RMD160 bcff0abded43438d372456ba98ddc44fc78c3bc0 files/makedepend-sh-gcc3.patch 549
@@ -19,14 +23,14 @@ EBUILD openpbs-2.3.16-r2.ebuild 2344 RMD160 aea57ae0c4e8f7be8d53e2d44a690ddd44b5
 MD5 efbcf306ebb2a5ce22fe826f24fcd951 openpbs-2.3.16-r2.ebuild 2344
 RMD160 aea57ae0c4e8f7be8d53e2d44a690ddd44b51966 openpbs-2.3.16-r2.ebuild 2344
 SHA256 be86d85263810ba99d6b340e7fc50f81a070795c2a0d690bd6922bc99c75144c openpbs-2.3.16-r2.ebuild 2344
-EBUILD openpbs-2.3.16-r3.ebuild 2398 RMD160 f3026eb4d877ab6ecceefa5086a586ec2fc38567 SHA1 566f694f67f32bcdbd8428fcc19fc956209cf670 SHA256 d0c33381dc4a1bc6e24214e6a0f126c4cfb442d79c1d8a09e16b7d3e53bcab2c
-MD5 534eea3bc75c93c72d814186dc258c5f openpbs-2.3.16-r3.ebuild 2398
-RMD160 f3026eb4d877ab6ecceefa5086a586ec2fc38567 openpbs-2.3.16-r3.ebuild 2398
-SHA256 d0c33381dc4a1bc6e24214e6a0f126c4cfb442d79c1d8a09e16b7d3e53bcab2c openpbs-2.3.16-r3.ebuild 2398
-MISC ChangeLog 3881 RMD160 ab824a2d08562c2ea9815c3f94685adcbaf5bc7d SHA1 d1afd7f1fa6cffff959d0da219d1bf18fb8cca84 SHA256 30c59b6f4b65fc0cfd1c2e946bd5ae73d82c4af3ee5a146003b5666b69c6b382
-MD5 44f25a2b9f65a0fb95da822657b4132d ChangeLog 3881
-RMD160 ab824a2d08562c2ea9815c3f94685adcbaf5bc7d ChangeLog 3881
-SHA256 30c59b6f4b65fc0cfd1c2e946bd5ae73d82c4af3ee5a146003b5666b69c6b382 ChangeLog 3881
+EBUILD openpbs-2.3.16-r3.ebuild 2491 RMD160 880035da9f4a013946736230bdcba425cf77475a SHA1 416e4fbfb6978878d2332680a8e458eefef14ada SHA256 966954401779eb71531942f80b7b70fcb015d353d65c98005b16d11f81d9a879
+MD5 d471ee1464fbad12fee56a23a35b9430 openpbs-2.3.16-r3.ebuild 2491
+RMD160 880035da9f4a013946736230bdcba425cf77475a openpbs-2.3.16-r3.ebuild 2491
+SHA256 966954401779eb71531942f80b7b70fcb015d353d65c98005b16d11f81d9a879 openpbs-2.3.16-r3.ebuild 2491
+MISC ChangeLog 4017 RMD160 a84f24d5b5dd5e9ccc906cef27128ff41b5e4345 SHA1 f46fcac65fed5501b15c20ec686caac5931be298 SHA256 f71cc45234bff9fc5c7d4f1dfae32bc2467226b52dc6ed8208fe3ed9922aed84
+MD5 3451526225178dff9fd95f52ba07d766 ChangeLog 4017
+RMD160 a84f24d5b5dd5e9ccc906cef27128ff41b5e4345 ChangeLog 4017
+SHA256 f71cc45234bff9fc5c7d4f1dfae32bc2467226b52dc6ed8208fe3ed9922aed84 ChangeLog 4017
 MISC metadata.xml 312 RMD160 6cfe7222819f902eed7dfdb6fa48a19b7c37172e SHA1 d9e2361eabc2098c0fa0b2fe45ba7cf317ad00a2 SHA256 7cd6722fa6245eccb8afde378bb57d0ac955b778512b3bef8789f2c463884e52
 MD5 41664043c4624dedcfeeb07950f08d13 metadata.xml 312
 RMD160 6cfe7222819f902eed7dfdb6fa48a19b7c37172e metadata.xml 312
diff --git a/sys-cluster/openpbs/files/2.3.16-gcc4.patch b/sys-cluster/openpbs/files/2.3.16-gcc4.patch
new file mode 100644
index 000000000000..fc810d0bf268
--- /dev/null
+++ b/sys-cluster/openpbs/files/2.3.16-gcc4.patch
@@ -0,0 +1,22 @@
+--- src/include/attribute.h
++++ src/include/attribute.h
+@@ -211,6 +211,8 @@
+ };
+ typedef struct attribute_def attribute_def;
+ 
++extern struct attribute_def  node_attr_def[];        /* node attributes defs */
++
+ /* Defines for type of Attribute based on data type 			*/
+ 
+ #define ATR_TYPE_LONG    1	/* Long integer, also Boolean */
+--- src/include/pbs_nodes.h
++++ src/include/pbs_nodes.h
+@@ -196,7 +194,7 @@
+ 	ND_ATR_LAST	/* WARNING: Must be the highest valued enum */
+ };
+ 
+-extern struct attribute_def  node_attr_def[];	/* node attributes defs */
++/* extern struct attribute_def  node_attr_def[];	*/ /* node attributes defs */
+ extern	struct pbsnode	**pbsndmast;		/* array of ptr to nodes  */
+ extern	struct pbsnode	**pbsndlist;		/* array of ptr to nodes  */
+ extern  int		  svr_totnodes;		/* number of nodes (hosts) */
diff --git a/sys-cluster/openpbs/openpbs-2.3.16-r3.ebuild b/sys-cluster/openpbs/openpbs-2.3.16-r3.ebuild
index 65f5eaae27d0..1bd974c69acf 100644
--- a/sys-cluster/openpbs/openpbs-2.3.16-r3.ebuild
+++ b/sys-cluster/openpbs/openpbs-2.3.16-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/openpbs/openpbs-2.3.16-r3.ebuild,v 1.5 2006/09/25 03:05:07 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/openpbs/openpbs-2.3.16-r3.ebuild,v 1.6 2006/09/25 17:25:32 dberkholz Exp $
 
 inherit eutils
 
@@ -45,13 +45,17 @@ src_unpack() {
 	epatch ${FILESDIR}/openpbs-gcc32.patch
 	# this thing doesn't use make install, but rather it's own install script
 	# fix it here so the install dirs are set to the ${D} directory
-	cd buildutils
+	pushd buildutils
 	mv pbs_mkdirs.in pbs_mkdirs.in-orig
 	sed -e "s|prefix=@prefix@|prefix=\${D}@prefix@| ; \
 			s|PBS_SERVER_HOME=@PBS_SERVER_HOME@|PBS_SERVER_HOME=\${D}@PBS_SERVER_HOME@| ; \
 			s|PBS_DEFAULT_FILE=@PBS_DEFAULT_FILE@|PBS_DEFAULT_FILE=\${D}@PBS_DEFAULT_FILE@| ; \
 			s|PBS_ENVIRON=@PBS_ENVIRON@|PBS_ENVIRON=\${D}@PBS_ENVIRON@|" \
 			pbs_mkdirs.in-orig > pbs_mkdirs.in
+	popd
+
+	# Patch from SuSE srpm, found on rpmfind.net
+	epatch ${FILESDIR}/${PV}-gcc4.patch
 }
 
 src_compile() {