[patch] libcap-pic-fixup.diff

libcap-pic-fixup.diff (text/plain), 4.07 KB, created by solar (RETIRED) on 2004-06-03 09:20:11 UTC

Index: Manifest
===================================================================
RCS file: /home/cvsroot/gentoo-x86/sys-libs/libcap/Manifest,v
retrieving revision 1.51
diff -u -b -B -w -p -r1.51 Manifest
--- Manifest	30 May 2004 09:06:06 -0000	1.51
+++ Manifest	3 Jun 2004 16:13:01 -0000
@@ -1,10 +1,11 @@
-MD5 3d5209ddce54c89ac8f60d158a5c5037 files/1.10-python.patch 2681
-MD5 1a4b48f5a76c206e51c3b2321abd87e1 files/digest-libcap-1.10-r3 129
+MD5 52c8adefebe3a6d4d0996bbde60639f0 ChangeLog 3282
+MD5 09797d17d72fc9a376f8f4241638ac75 libcap-1.10-r3.ebuild 1803
+MD5 959bfc3a90feaf72b6dd1480f5dab156 libcap-1.10-r4.ebuild 2032
+MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 MD5 8f279ebf325d1b8efb6ad3c3a0d8cb5d files/libcap-1.10-python.patch 3353
+MD5 1a4b48f5a76c206e51c3b2321abd87e1 files/digest-libcap-1.10-r3 129
+MD5 efe8ebfabfe5681505f7edeb8617a13d files/libcap-1.10-pic.patch 388
 MD5 3aa7335821ba75c0994083995b0331f2 files/libcap-1.10-syscall.patch 1051
+MD5 3d5209ddce54c89ac8f60d158a5c5037 files/1.10-python.patch 2681
 MD5 2f1adcade85a501a8b4d47ddeb66ec9b files/digest-libcap-1.10-r4 129
 MD5 1f60409beeba2a799bfbc44a8b826f11 files/libcap-1.10-r4-staticfix.diff 2113
-MD5 52c8adefebe3a6d4d0996bbde60639f0 ChangeLog 3282
-MD5 a5216c04eac15e047f075c8ce5264950 libcap-1.10-r3.ebuild 1861
-MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
-MD5 9454be6a56129ec761c1ef7b2e0b430b libcap-1.10-r4.ebuild 2125
Index: libcap-1.10-r3.ebuild
===================================================================
RCS file: /home/cvsroot/gentoo-x86/sys-libs/libcap/libcap-1.10-r3.ebuild,v
retrieving revision 1.12
diff -u -b -B -w -p -r1.12 libcap-1.10-r3.ebuild
--- libcap-1.10-r3.ebuild	28 May 2004 18:01:27 -0000	1.12
+++ libcap-1.10-r3.ebuild	3 Jun 2004 16:13:01 -0000
@@ -27,6 +27,7 @@ src_unpack() {
 	cd ${S}
 	epatch ${WORKDIR}/libcap_${PV}-${DEB_PVER}.diff
 	epatch ${FILESDIR}/${PV}-python.patch
+	epatch ${FILESDIR}/${PN}-1.10-pic.patch
 	sed -i 's|WARNINGS=-ansi|WARNINGS=|' Make.Rules
 }
 
@@ -38,10 +39,6 @@ src_compile() {
 		append-flags -I/usr/include/python${PYTHONVER}
 	fi
 
-	use alpha && append-flags -fPIC
-	use amd64 && append-flags -fPIC
-	use hppa && append-flags -fPIC
-
 	emake COPTFLAG="${CFLAGS}" DEBUG="" ${myflags} || die
 }
 
Index: libcap-1.10-r4.ebuild
===================================================================
RCS file: /home/cvsroot/gentoo-x86/sys-libs/libcap/libcap-1.10-r4.ebuild,v
retrieving revision 1.3
diff -u -b -B -w -p -r1.3 libcap-1.10-r4.ebuild
--- libcap-1.10-r4.ebuild	28 May 2004 18:01:27 -0000	1.3
+++ libcap-1.10-r4.ebuild	3 Jun 2004 16:13:01 -0000
@@ -13,7 +13,7 @@ SRC_URI="http://www.kernel.org/pub/linux
 LICENSE="GPL-2 BSD"
 SLOT="0"
 KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha arm ~hppa ~amd64 ~ia64"
-IUSE="python pic static"
+IUSE="python static"
 
 #patch is in recent 2.2 kernels so it works there
 DEPEND="virtual/glibc
@@ -28,6 +28,7 @@ src_unpack() {
 	epatch ${WORKDIR}/libcap_${PV}-${DEB_PVER}.diff
 	epatch ${FILESDIR}/${PV}-python.patch
 	epatch ${FILESDIR}/libcap-1.10-r4-staticfix.diff
+	epatch ${FILESDIR}/${PN}-1.10-pic.patch
 	sed -i 's|WARNINGS=-ansi|WARNINGS=|' Make.Rules
 }
 
@@ -40,11 +41,6 @@ src_compile() {
 		append-flags -I/usr/include/python${PYTHONVER}
 	fi
 
-	use pic && append-flags -fPIC
-	use alpha && append-flags -fPIC
-	use amd64 && append-flags -fPIC
-	use hppa && append-flags -fPIC
-
 	emake COPTFLAG="${CFLAGS}" LDFLAGS="${LDFLAGS}" DEBUG="" ${myflags} || die
 }
 
Index: files/libcap-1.10-pic.patch
===================================================================
RCS file: files/libcap-1.10-pic.patch
diff -N files/libcap-1.10-pic.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ files/libcap-1.10-pic.patch	3 Jun 2004 16:13:01 -0000
@@ -0,0 +1,11 @@
+--- Make.Rules.orig	2004-06-03 12:00:51.000000000 -0400
++++ Make.Rules	2004-06-03 12:01:37.000000000 -0400
+@@ -54,7 +54,7 @@
+ IPATH=-I$(topdir)/libcap/include
+ INCS=$(topdir)/libcap/include/sys/capability.h
+ LIBS=-L$(topdir)/libcap -lcap
+-CFLAGS=-Dlinux $(WARNINGS) $(DEBUG) $(COPTFLAG) $(IPATH)
++CFLAGS=-Dlinux -fPIC $(WARNINGS) $(DEBUG) $(COPTFLAG) $(IPATH)
+ 
+ # Global cleanup stuff
+