Instead of being choosy about what arches to use -fPIC on, just use it on all of them. This fixes bug 48839 (pam fails to build on ia64)

4 files changed, 23 insertions, 17 deletions

diff --git a/dev-libs/glib/ChangeLog b/dev-libs/glib/ChangeLog
index b08246df07b7..bf65d4c3bbfe 100644
--- a/dev-libs/glib/ChangeLog
+++ b/dev-libs/glib/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/glib
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/ChangeLog,v 1.67 2004/04/19 22:48:52 avenj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/ChangeLog,v 1.68 2004/04/24 03:28:24 agriffis Exp $
+
+  23 Apr 2004; Aron Griffis <agriffis@gentoo.org> glib-1.2.10-r5.ebuild:
+  Instead of being choosy about what arches to use -fPIC on, just use it on all
+  of them. This fixes bug 48839 (pam fails to build on ia64)
 
   19 Apr 2004; Jon Portnoy <avenj@gentoo.org> glib-1.2.10-r5.ebuild :
   Call gnuconfig_update on AMD64 to fix AMD64 bootstrap breakage.
diff --git a/dev-libs/glib/Manifest b/dev-libs/glib/Manifest
index a869b8aa7844..f3353a40b86d 100644
--- a/dev-libs/glib/Manifest
+++ b/dev-libs/glib/Manifest
@@ -1,15 +1,15 @@
-MD5 af20751bf8d613f84d670139a83c1bb4 ChangeLog 9079
-MD5 7a7783869980cd7a3361f04e8e769d1b glib-1.2.10-r5.ebuild 1915
-MD5 0fb4513bc18a08f8d2ab709b9ea68215 glib-2.2.1-r1.ebuild 1190
-MD5 08829d19dd1751736b8c86fc65cc28c7 glib-2.2.1.ebuild 1064
+MD5 8db0cf84c6d0cee578036eef249cf7d0 ChangeLog 9297
+MD5 262e049ba7f608752be348b8ce49ab0d glib-1.2.10-r5.ebuild 2109
 MD5 74da7bd6b8a2f13c22d068ba87de8289 glib-2.2.2.ebuild 1192
+MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 MD5 fbf2fcb880edb27c620dd6c1ee0d6571 glib-2.2.3.ebuild 1027
+MD5 1e176e1fa3c026c3566ed08a3234493d glib-2.2.1.ebuild 1064
+MD5 0fb4513bc18a08f8d2ab709b9ea68215 glib-2.2.1-r1.ebuild 1190
 MD5 eed32c87b02a65f0c0045a2db768e08c glib-2.4.0.ebuild 1011
-MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 MD5 0b6b97a59b4b0e1acc433697ce022a3c files/digest-glib-1.2.10-r5 63
-MD5 f1d1917d455b88ebd5cdcf76d94e84d4 files/digest-glib-2.2.1 64
-MD5 f1d1917d455b88ebd5cdcf76d94e84d4 files/digest-glib-2.2.1-r1 64
 MD5 8edb351cbbf69e68f599f517e2152ca4 files/digest-glib-2.2.2 64
 MD5 b8ffd1df331b401706a2ac487f28fee8 files/digest-glib-2.2.3 64
 MD5 4d1022292a5ca1a8dc708f7dac746b91 files/digest-glib-2.4.0 64
+MD5 f1d1917d455b88ebd5cdcf76d94e84d4 files/digest-glib-2.2.1 64
+MD5 f1d1917d455b88ebd5cdcf76d94e84d4 files/digest-glib-2.2.1-r1 64
 MD5 2657ca6d0c857b4e97ad93525212ffa1 files/glib-1.2.10-gcc34-fix.patch 2008
diff --git a/dev-libs/glib/glib-1.2.10-r5.ebuild b/dev-libs/glib/glib-1.2.10-r5.ebuild
index 4a002aaf3b69..77738791e89e 100644
--- a/dev-libs/glib/glib-1.2.10-r5.ebuild
+++ b/dev-libs/glib/glib-1.2.10-r5.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-1.2.10-r5.ebuild,v 1.19 2004/04/19 22:48:52 avenj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-1.2.10-r5.ebuild,v 1.20 2004/04/24 03:28:24 agriffis Exp $
 
-inherit libtool gnuconfig
+inherit libtool gnuconfig flag-o-matic
 
 DESCRIPTION="The GLib library of C routines"
 HOMEPAGE="http://www.gtk.org/"
@@ -44,16 +44,18 @@ src_compile() {
 	# Brad House <brad_mssw@gentoo.org> 1/2/2004
 #	libtoolize -c -f
 
+	# Bug 48839: pam fails to build on ia64
+	# The problem is that it attempts to link a shared object against
+	# libglib.a; this library needs to be built with -fPIC.  Since
+	# this package doesn't contain any significant binaries, build the
+	# whole thing with -fPIC (23 Apr 2004 agriffis)
+	append-flags -fPIC
 
 	econf \
 		--with-threads=posix \
 		--enable-debug=yes || die
 
-	if [ "${ARCH}" = "alpha" -o "${ARCH}" = "amd64" -o "${ARCH}" = "hppa" ] ; then
-		emake CFLAGS="${CFLAGS} -fPIC" || die
-	else
-		emake || die
-	fi
+	emake || die
 }
 
 src_install() {
diff --git a/dev-libs/glib/glib-2.2.1.ebuild b/dev-libs/glib/glib-2.2.1.ebuild
index c05a501d0994..4d919b1e7c46 100644
--- a/dev-libs/glib/glib-2.2.1.ebuild
+++ b/dev-libs/glib/glib-2.2.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.2.1.ebuild,v 1.14 2004/02/22 20:02:50 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.2.1.ebuild,v 1.15 2004/04/24 03:28:24 agriffis Exp $
 
 inherit libtool