Fix compile bug on IA64 with GCC < 4.1.

Package-Manager: portage-2.1.1_pre4-r4

4 files changed, 67 insertions, 10 deletions

diff --git a/dev-libs/glib/ChangeLog b/dev-libs/glib/ChangeLog
index 4c16925f16eb..00f4e184d08f 100644
--- a/dev-libs/glib/ChangeLog
+++ b/dev-libs/glib/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/glib
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/ChangeLog,v 1.211 2006/08/16 14:20:07 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/ChangeLog,v 1.212 2006/08/18 22:18:31 plasmaroo Exp $
+
+  18 Aug 2006; Tim Yamin <plasmaroo@gentoo.org> glib-2.10.3.ebuild,
+  +files/glib-2.10.3-ia64-atomic-ops.patch:
+  Fix compile bug on IA64 with GCC < 4.1.
 
   16 Aug 2006; Markus Rothe <corsair@gentoo.org> glib-2.10.3.ebuild:
   Stable on ppc64
diff --git a/dev-libs/glib/Manifest b/dev-libs/glib/Manifest
index 37bde7a9cad9..cfbe5dfee3a0 100644
--- a/dev-libs/glib/Manifest
+++ b/dev-libs/glib/Manifest
@@ -14,6 +14,10 @@ AUX glib-2-macos.patch 989 RMD160 90e681aec6f902f76551dc943f2b99d9cf7256ee SHA1
 MD5 1a4565b760afb02416ff0d674c89c83f files/glib-2-macos.patch 989
 RMD160 90e681aec6f902f76551dc943f2b99d9cf7256ee files/glib-2-macos.patch 989
 SHA256 c8396affecb27325453d1b1447d9b1432c7e72b1565215e83e7005a95ce19713 files/glib-2-macos.patch 989
+AUX glib-2.10.3-ia64-atomic-ops.patch 1058 RMD160 066e63a99739dc412fbed7f773118323f53ea774 SHA1 13c22e2f75a77e9e0546e495fd28015ddcb8bade SHA256 ad9cad6793626b4e36a59aa6cb839607847aa57ebc37592fd1e273ccd23a53c8
+MD5 e6b77b46d340163d9b2efa6a8cb38dde files/glib-2.10.3-ia64-atomic-ops.patch 1058
+RMD160 066e63a99739dc412fbed7f773118323f53ea774 files/glib-2.10.3-ia64-atomic-ops.patch 1058
+SHA256 ad9cad6793626b4e36a59aa6cb839607847aa57ebc37592fd1e273ccd23a53c8 files/glib-2.10.3-ia64-atomic-ops.patch 1058
 AUX glib-2.6.3-testglib-ssp.patch 344 RMD160 6709acf85c52e39553e2e5ee93637f7e9cc7eca6 SHA1 403b249a460a9700669e754a562fb6974f3d6898 SHA256 c2ece3d7b4533e3bfbe8100df5d0824176d9dfa0b18697a8919162956c8ebfa8
 MD5 7fec226893c96f1126810906e2fb3e5b files/glib-2.6.3-testglib-ssp.patch 344
 RMD160 6709acf85c52e39553e2e5ee93637f7e9cc7eca6 files/glib-2.6.3-testglib-ssp.patch 344
@@ -34,10 +38,10 @@ EBUILD glib-1.2.10-r5.ebuild 1602 RMD160 a45e5b63cf9650771e10b4d788aa35a49b74695
 MD5 0a7b1c38639898440d5eed0f6430a507 glib-1.2.10-r5.ebuild 1602
 RMD160 a45e5b63cf9650771e10b4d788aa35a49b746957 glib-1.2.10-r5.ebuild 1602
 SHA256 0a415f949fc9875f48c0f187117be4de24419d48d9444081e433c5be1a8cbcf8 glib-1.2.10-r5.ebuild 1602
-EBUILD glib-2.10.3.ebuild 1836 RMD160 6627bc7926d40f3a08bbd6cb20cfd198729a163f SHA1 2d2cdafb87e6331beaee0e6bc4d7b2c2227e24da SHA256 8a9f38145930e7424e1509e112b343afe39767f5493b07176879a7d351b47a2b
-MD5 afcac074c2bce386b23d204214eb2897 glib-2.10.3.ebuild 1836
-RMD160 6627bc7926d40f3a08bbd6cb20cfd198729a163f glib-2.10.3.ebuild 1836
-SHA256 8a9f38145930e7424e1509e112b343afe39767f5493b07176879a7d351b47a2b glib-2.10.3.ebuild 1836
+EBUILD glib-2.10.3.ebuild 2090 RMD160 52efdb8a8d2ce7561aa7cc41ebdf36930380d962 SHA1 343604a4cd9297a2bc0fe3372f951a5a8d947d20 SHA256 c10309311f26fb8cfb7f6fed9df53ee84a8b08e32f3117d1e6c8d9797496180b
+MD5 7482e0b861ee7e12522be9f99ba41e19 glib-2.10.3.ebuild 2090
+RMD160 52efdb8a8d2ce7561aa7cc41ebdf36930380d962 glib-2.10.3.ebuild 2090
+SHA256 c10309311f26fb8cfb7f6fed9df53ee84a8b08e32f3117d1e6c8d9797496180b glib-2.10.3.ebuild 2090
 EBUILD glib-2.12.0.ebuild 1846 RMD160 a02e841c23aa3ba22adc884cd8cdf40514365395 SHA1 c4aa63d0bee60033add9c2c906f6c55b80194ce7 SHA256 63aee0a4dc5a0c1582172837b898b3f1ea6756c570f1deb8df021a3229321a3d
 MD5 9e41baddabf873e6f73173665bb1b23a glib-2.12.0.ebuild 1846
 RMD160 a02e841c23aa3ba22adc884cd8cdf40514365395 glib-2.12.0.ebuild 1846
@@ -62,10 +66,10 @@ EBUILD glib-2.8.6.ebuild 1608 RMD160 338d8be78856ce5a8ba7d8469c897cb180b8cfa1 SH
 MD5 bf003c8a49124eb8f907181ee83ccf4e glib-2.8.6.ebuild 1608
 RMD160 338d8be78856ce5a8ba7d8469c897cb180b8cfa1 glib-2.8.6.ebuild 1608
 SHA256 f9c35f88a5eb9cb668edf620f234ef87dc55c080733122975068679fac7b6bed glib-2.8.6.ebuild 1608
-MISC ChangeLog 24557 RMD160 47db61a2824aa53389751f18244629f030194ee4 SHA1 8522a6984cd78161c08758eff333c827606f9074 SHA256 ad40ba51e29aece6cfcee58d5dc79a58f304b56f36e249bba6da09a024a2fcaa
-MD5 1b82cabd5a656e22c17cc2725280fd4e ChangeLog 24557
-RMD160 47db61a2824aa53389751f18244629f030194ee4 ChangeLog 24557
-SHA256 ad40ba51e29aece6cfcee58d5dc79a58f304b56f36e249bba6da09a024a2fcaa ChangeLog 24557
+MISC ChangeLog 24714 RMD160 08990b9748d246bb10f8caac4f8bcf04ea6cd747 SHA1 381b43c5d511278d65aabff46e3ac88639b60d82 SHA256 9485a461998538a40bf78fabe3dbf83e82ded7c6284edda8ce7a028fc046c27c
+MD5 14b6aaaa25b326da47e34aa69878e444 ChangeLog 24714
+RMD160 08990b9748d246bb10f8caac4f8bcf04ea6cd747 ChangeLog 24714
+SHA256 9485a461998538a40bf78fabe3dbf83e82ded7c6284edda8ce7a028fc046c27c ChangeLog 24714
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e metadata.xml 158
diff --git a/dev-libs/glib/files/glib-2.10.3-ia64-atomic-ops.patch b/dev-libs/glib/files/glib-2.10.3-ia64-atomic-ops.patch
new file mode 100644
index 000000000000..0859e3310a17
--- /dev/null
+++ b/dev-libs/glib/files/glib-2.10.3-ia64-atomic-ops.patch
@@ -0,0 +1,39 @@
+From Debian, this one is needed for gcc < 4.1...
+
+--- glib-2.10.0/glib/gatomic.c	2006-02-24 14:02:51.000000000 +0000
++++ glib-2.10.0/glib/gatomic.c	2006-03-06 18:12:06.000000000 +0000
+@@ -414,14 +414,14 @@
+ g_atomic_int_exchange_and_add (volatile gint *atomic,
+ 			       gint           val)
+ {
+-  return __sync_fetch_and_add (atomic, val);
++  return __sync_fetch_and_add_si (atomic, val);
+ }
+  
+ void
+ g_atomic_int_add (volatile gint *atomic, 
+ 		  gint val)
+ {
+-  __sync_fetch_and_add (atomic, val);
++  __sync_fetch_and_add_si (atomic, val);
+ }
+ 
+ gboolean
+@@ -429,7 +429,7 @@
+ 				   gint           oldval, 
+ 				   gint           newval)
+ {
+-  return __sync_bool_compare_and_swap (atomic, oldval, newval);
++  return __sync_bool_compare_and_swap_si (atomic, oldval, newval);
+ }
+ 
+ gboolean
+@@ -437,7 +437,7 @@
+ 				       gpointer           oldval, 
+ 				       gpointer           newval)
+ {
+-  return __sync_bool_compare_and_swap ((long *)atomic, 
++  return __sync_bool_compare_and_swap_di ((long *)atomic, 
+ 				       (long)oldval, (long)newval);
+ }
+ 
diff --git a/dev-libs/glib/glib-2.10.3.ebuild b/dev-libs/glib/glib-2.10.3.ebuild
index f9bef02c18fe..19f5924382b9 100644
--- a/dev-libs/glib/glib-2.10.3.ebuild
+++ b/dev-libs/glib/glib-2.10.3.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/dev-libs/glib/glib-2.10.3.ebuild,v 1.10 2006/08/16 14:20:07 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.10.3.ebuild,v 1.11 2006/08/18 22:18:31 plasmaroo Exp $
 
 inherit gnome.org libtool eutils flag-o-matic debug
 
@@ -34,6 +34,16 @@ src_unpack() {
 		epatch "${FILESDIR}"/glib-2.6.3-testglib-ssp.patch
 	fi
 
+	if use ia64; then
+		# Only apply for < 4.1
+		local ma="$(gcc-major-version)"
+		local mi="$(gcc-minor-version)"
+		if [[ "${ma}" -lt 4 ]] || [[ "${ma}" -eq 4 && "${mi}" -eq 0 ]]
+		then
+			epatch "${FILESDIR}/glib-2.10.3-ia64-atomic-ops.patch"
+		fi
+	fi
+
 	epatch ${FILESDIR}/${PN}-2.8.3-macos.patch
 
 }