Build static library without -fPIC and make it optional wrt #379849 by Agostino Sarubbo <ago@gentoo.org>

Package-Manager: portage-2.2.0_alpha93/cvs/Linux x86_64

4 files changed, 111 insertions, 21 deletions

diff --git a/sys-process/numactl/ChangeLog b/sys-process/numactl/ChangeLog
index ce9f60ceb7c3..c50d92915a2d 100644
--- a/sys-process/numactl/ChangeLog
+++ b/sys-process/numactl/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-process/numactl
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/numactl/ChangeLog,v 1.21 2012/03/22 19:13:11 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-process/numactl/ChangeLog,v 1.22 2012/03/22 21:50:02 xarthisius Exp $
+
+*numactl-2.0.7-r2 (22 Mar 2012)
+
+  22 Mar 2012; Kacper Kowalik <xarthisius@gentoo.org>
+  +files/numactl-2.0.7-static_libs.patch, +numactl-2.0.7-r2.ebuild,
+  -numactl-2.0.7-r1.ebuild:
+  Build static library without -fPIC and make it optional wrt #379849 by
+  Agostino Sarubbo <ago@gentoo.org>
 
   22 Mar 2012; Mike Frysinger <vapier@gentoo.org> numactl-2.0.7-r1.ebuild:
   Fix libdir handling and update to EAPI=4 #379849 by Agostino Sarubbo.
diff --git a/sys-process/numactl/Manifest b/sys-process/numactl/Manifest
index 3254c0d8ef68..e7bf439f33d6 100644
--- a/sys-process/numactl/Manifest
+++ b/sys-process/numactl/Manifest
@@ -1,31 +1,32 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX numactl-2.0.2-build.patch 429 RMD160 3149ef4e8d1ea6ced276274c6e2a50bfd3605b52 SHA1 eb84cc657294cbc5a6109595cb44a5581d0acf52 SHA256 fb5f82ff6e967e76ca10af59faada34518881273167df1cb7937940a6a50d390
 AUX numactl-2.0.5-protos.patch 228 RMD160 68bc731c6b65ac84394ba702010bdfcb16824f4a SHA1 039a52207372bb3ca8f857636fbb126eec8d6f18 SHA256 9508f0836d113ec1c6f3d89732861f6e1f7f920a34ad1230fe2d0488435d4b27
+AUX numactl-2.0.7-static_libs.patch 2609 RMD160 36da12b1c8c22d43f9c172523aad08019dead7d4 SHA1 630c6cf63168383492a37d4f62c60e5205c3cb67 SHA256 fd44628c1ac77266d3ad1107fd80bd85f44da91c7f77a1a299d5947e1fa9cb7a
 DIST numactl-2.0.2.tar.gz 70187 RMD160 72ef94e604a1162117d70df60cab5e38f2235961 SHA1 3f70f6ef037584dcd5f5d26e7407d5465a866b81 SHA256 9a675ac94267c5370b6016e57cd437211a6f5f456a6decb1f7973f602e1b44f1
 DIST numactl-2.0.5.tar.gz 78975 RMD160 19ae3ab2a5b69fb2ed3d7f61b4030c67b12fcb13 SHA1 608d19ee802ae1b54a751567d7d6d9cbb4311b8a SHA256 afffcc0a237ec71737a3f3ecda5e0b4e0ede5c3a894af7d85f5416fa35f7b44c
 DIST numactl-2.0.7.tar.gz 275686 RMD160 9f1eca64522ae4a5640f44ee306c780607dd3ee6 SHA1 dfdf539da65d1e880f04202071c139c4d2ba2da9 SHA256 0a1e237a98649c5cd2db7c684afe33bb81d290b406cf00d0469bdba9a11b39ef
 EBUILD numactl-2.0.2.ebuild 1337 RMD160 705d9f600b8d94b7b979f6f57404d3ccf4f96e6f SHA1 64dba443cd299049da10a82cb099448320e651e9 SHA256 79e55f8e717949b8510dca9c900a2d359477021e1b0f47f8faf3942a6ba8136e
 EBUILD numactl-2.0.5.ebuild 1340 RMD160 9b65b047c1b4d2b1d8cd8337db046be087675297 SHA1 5e57f7d2468e90ad153224afd46eeebdf3e2c57b SHA256 47bc06ec50a7eb689a3820e4aca0fe5efad7090e5ac46f52631164d9266dbb8f
-EBUILD numactl-2.0.7-r1.ebuild 1343 RMD160 a8b25bdd9c576a427789d4215d14247ac76c500b SHA1 ff83e372fbc7f5ca9697bf36d9286b587069dd31 SHA256 38131e90f3243a656a9fc9f861e05acdb2a3323fb285226151203265c7cceb57
+EBUILD numactl-2.0.7-r2.ebuild 1474 RMD160 e593fc6bf5597171f8f9fda6b72573f65447786a SHA1 399f3458ab3a0cbcfcdec3a6dc8cc25c0e327f2f SHA256 019970080c4a3eddc93e33e5d08a52b3a90b7e6d1cbb47f56708296f6ecf6649
 EBUILD numactl-2.0.7.ebuild 1255 RMD160 95687a4368cf9332e973e36632f8ef00dc1c11ce SHA1 52dde6747b288865a32eb14368025a46d4221728 SHA256 ab4288f89adc7e2abef9fb23ff7d3cbe28fb89860c5e906fbe9c7eaf8de336a6
-MISC ChangeLog 3185 RMD160 2967f12e6c962d2862f751fc0ef02b8fa058ece3 SHA1 874b0f414bb1f86d38e2cb9cdeb812320c209602 SHA256 d053f17c7f3995bba824346d8faeeebd9b1d948a5e6de77dda3f4761c6ed015a
+MISC ChangeLog 3482 RMD160 e4d4a477e5d3481d95c5f183b9cc45930bc01bcd SHA1 8ef2e3c15d7ac4c0f9e6f046639e7ddffbf3ef7c SHA256 d88f88e9595d817567b4d2b0307b32bf09f8baf21e4972b93a6fb9221f7f2cc3
 MISC metadata.xml 168 RMD160 b985d73a0da9e38afe23c1061e6113fc28971119 SHA1 48145e0b5071fdd7ff3cf1f699253c04106b246a SHA256 436175a0fd4552a218e3474f07665550f601d21c541e64cc2564581021325a26
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBAgAGBQJPa3nOAAoJELEHsLL7fEFWWUIQAI7bb9fiPFm+EZ9epI6PF/Zr
-sccrO6wiYTaARm8VlT7DnxbSsWLbUHQCmdTwo7+1SBj7kxx470i33y7JgWAfz4LK
-47MqRM/9gdhG5+HrU6w/GMmfHEFbwElVuu+dQ9IdUYIiKO1O31dLcY1QibUKUNfF
-P4pi3YKv69z6hYuQBQ3m1SyC0RDtOLfxkP4hgWHn3j6I51H3ghEmDIB+l4qB2nw/
-hIMkpRvrV87f/IeidDTFJLEcvu0masi4b/qJnE5TGar37WgZgcGfzXcZtWhQ4mP9
-LuKTuja7EaUsuUYS0z6JgK+fJwU/Li5Fs/H30QaK3B2XG/HRq1vT5VYJJnTnUaWH
-CZgiUvXqx9/diIR+ihrd0TW+md0rjET1uU2RG795tTitW6t4X1fd37FMtjExT0wJ
-oSlLfEjYgTe0Sxkh80teObOjJq0dolhzq3Z18S92D0iAYQVG4n8sft7V09WuT+tP
-R0vELniKyZeWdv7bQbxOUmPOqToiqViVVkyl11ImXEcu0aXpvtif0VN0bbF27HyX
-+Ai63bXYyepLbRoC7KGbn9kKVJk1CoWXjdUTiaGVY2f4xGC6u9a6VTHjTRePv67d
-/iAjawYlAg/YIqlAzqLwrZLOrO2litrKKu2xCzFa+2lC+0kZAeO3GWdNLCGT6s2z
-5k8JGCQfljrg5iVUeAjr
-=0PlQ
+iQIcBAEBCAAGBQJPa56TAAoJEF0huFKJUZL546wP/18RO3tl3Fx+/aytEEWXV1Yx
+tH8ZC8KChFTrgHhpkWQ1N06BHBw4ta4UGPqxSCUUnW/vyf48LBSCRJWgNCjhoFLu
+ftGxK00OYI+Dlb7NAe3IKqrUe4KdY//kIm32J/UL1nFhmHe5N/cjW3EgNv52SRi0
+aTBwG4QJjzyx5Pv0WEB2dK4nfTVFP6hE3qBc/mOdUAVH5PK+tzXkyKdkYBjfdhzC
+aF6P7BAhEmQb/v2qY1k50PqfhNuZaFcZfoSIit6sXNavMLZlLmPddWwSrnQDRhCi
+kMutU+DVKwtCEyjq45mMb4v2Ea1PnIlgO2zgH3jVseqCxew4FnhzC8SmrJ+8qQqt
+nB7Ftn1VZUbAKnkGWuFODINAGyoK4hRyBkUT658NM/iS9KukLXi5P/sfv8Z1eCHE
+7gmGWmaukwXNPEJ1JFHue8SYPgf1s/wi6gCWmd86juJc4KcU4NtRROEILtOY6zID
+IiImGfklILQ1M5H2VzJSimNz1mfBlrQ3JjzCKe3Vl2Xa8lqt5JYRnggiACMtvaG8
+a1uMFOs5uxSO6JiUPUAJl2kYtPNUZHRWLDbF/GrU7efsQUXEMmao98pjBs8HdEM8
+iN/+gKYzVoKzoHVQh/WJtVmHCkRyPO4DNn9Jdc8O92Pp7WvRIe2zgt2VVisJqa6u
+i6QOA4EKSJxmtfOQg3DA
+=v45M
 -----END PGP SIGNATURE-----
diff --git a/sys-process/numactl/files/numactl-2.0.7-static_libs.patch b/sys-process/numactl/files/numactl-2.0.7-static_libs.patch
new file mode 100644
index 000000000000..27bd9b61ab9d
--- /dev/null
+++ b/sys-process/numactl/files/numactl-2.0.7-static_libs.patch
@@ -0,0 +1,79 @@
+Build static libs without -fPIC and only if BUILD_STATIC=yes
+
+https://bugs.gentoo.org/show_bug.cgi?id=379849
+
+Patch written by Kacper Kowalik <xarthisius@gentoo.org>
+--- a/Makefile
++++ b/Makefile
+@@ -7,6 +7,8 @@
+ # for compatibility with old releases
+ CFLAGS += ${OPT_CFLAGS}
+ override CFLAGS += -I.
++# build static libraries by default
++BUILD_STATIC ?= yes
+ 
+ # find out if compiler supports __thread
+ THREAD_SUPPORT := $(shell if $(CC) $(CFLAGS) threadtest.c -o threadtest \
+@@ -24,6 +26,7 @@
+ 
+ CLEANFILES := numactl.o libnuma.o numactl numademo numademo.o distance.o \
+ 	      memhog libnuma.so libnuma.so.1 numamon numamon.o syscall.o bitops.o \
++	      distance.pic.o libnuma.pic.o syscall.pic.o \
+ 	      memhog.o util.o stream_main.o stream_lib.o shm.o stream clearcache.o \
+ 	      test/pagesize test/tshared test/mynode.o test/tshared.o mt.o empty.o empty.c \
+ 	      test/mynode test/ftok test/prefered test/randmap \
+@@ -40,10 +43,15 @@
+ libdir := ${prefix}/$(shell ./getlibdir)
+ docdir := ${prefix}/share/doc
+ 
++NUMA_LIBS = libnuma.so
++ifeq ($(BUILD_STATIC),yes)
++NUMA_LIBS+= libnuma.a
++endif
++
+ all: numactl migratepages migspeed libnuma.so numademo numamon memhog \
+      test/tshared stream test/mynode test/pagesize test/ftok test/prefered \
+      test/randmap test/nodemap test/distance test/tbitmap test/move_pages \
+-     test/mbind_mig_pages test/migrate_pages test/realloc_test libnuma.a
++     test/mbind_mig_pages test/migrate_pages test/realloc_test ${NUMA_LIBS}
+ 
+ numactl: numactl.o util.o shm.o bitops.o libnuma.so
+ 
+@@ -81,13 +89,14 @@
+ 
+ libnuma.so.1: versions.ldscript
+ 
+-libnuma.so.1: libnuma.o syscall.o distance.o
++libnuma.so.1: libnuma.pic.o syscall.pic.o distance.pic.o
+ 	${CC} ${LDFLAGS} -shared -Wl,-soname=libnuma.so.1 -Wl,--version-script,versions.ldscript -Wl,-init,numa_init -Wl,-fini,numa_fini -o libnuma.so.1 $(filter-out versions.ldscript,$^)
+ 
+ libnuma.so: libnuma.so.1
+ 	ln -sf libnuma.so.1 libnuma.so
+ 
+-libnuma.o : CFLAGS += -fPIC
++%.pic.o: %.c
++	${CC} -fPIC ${CPPFLAGS} ${CFLAGS} -c $< -o $@
+ 
+ AR ?= ar
+ RANLIB ?= ranlib
+@@ -95,10 +104,6 @@
+ 	$(AR) rc $@ $^
+ 	$(RANLIB) $@
+ 
+-distance.o : CFLAGS += -fPIC
+-
+-syscall.o : CFLAGS += -fPIC
+-
+ test/tshared: test/tshared.o libnuma.so
+ 
+ test/mynode: test/mynode.o libnuma.so
+@@ -143,7 +148,9 @@
+ 	mkdir -p ${libdir}
+ 	install -m 0755 libnuma.so.1 ${libdir}
+ 	cd ${libdir} ; ln -sf libnuma.so.1 libnuma.so
++ifeq ($(BUILD_STATIC),yes)
+ 	install -m 0644 libnuma.a ${libdir}
++endif
+ 	mkdir -p ${prefix}/include
+ 	install -m 0644 numa.h numaif.h numacompat1.h ${prefix}/include
+ 	install -m 0755 numastat ${prefix}/bin
diff --git a/sys-process/numactl/numactl-2.0.7-r1.ebuild b/sys-process/numactl/numactl-2.0.7-r2.ebuild
index da8b7ef7d2b1..3a36ed830bde 100644
--- a/sys-process/numactl/numactl-2.0.7-r1.ebuild
+++ b/sys-process/numactl/numactl-2.0.7-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/numactl/numactl-2.0.7-r1.ebuild,v 1.3 2012/03/22 19:13:11 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-process/numactl/numactl-2.0.7-r2.ebuild,v 1.1 2012/03/22 21:50:02 xarthisius Exp $
 
 EAPI="4"
 
@@ -13,16 +13,18 @@ SRC_URI="ftp://oss.sgi.com/www/projects/libnuma/download/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux"
-IUSE="perl"
+IUSE="perl static-libs"
 
 RDEPEND="perl? ( dev-lang/perl )"
 
 src_prepare() {
 	echo "printf $(get_libdir)" > getlibdir
+	epatch "${FILESDIR}"/${P}-static_libs.patch
 }
 
 src_compile() {
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" BENCH_CFLAGS=""
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" BENCH_CFLAGS="" \
+		BUILD_STATIC=$(usex static-libs)
 }
 
 src_test() {
@@ -37,7 +39,7 @@ src_test() {
 }
 
 src_install() {
-	emake install prefix="${ED}/usr"
+	emake install prefix="${ED}/usr" BUILD_STATIC=$(usex static-libs)
 	# delete man pages provided by the man-pages package #238805
 	rm -rf "${ED}"/usr/share/man/man[25]
 	doman *.8 # makefile doesnt get them all