Build our own libelf, bug #479494 by Yuta SATOH

Package-Manager: portage-2.2.0_alpha196/cvs/Linux x86_64
Manifest-Sign-Key: 0x160F534A

4 files changed, 72 insertions, 11 deletions

diff --git a/sys-freebsd/freebsd-lib/ChangeLog b/sys-freebsd/freebsd-lib/ChangeLog
index f4d21356299f..f9b3ca1cbcfa 100644
--- a/sys-freebsd/freebsd-lib/ChangeLog
+++ b/sys-freebsd/freebsd-lib/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-freebsd/freebsd-lib
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v 1.198 2013/08/11 19:51:40 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v 1.199 2013/08/11 20:31:07 aballier Exp $
+
+  11 Aug 2013; Alexis Ballier <aballier@gentoo.org> freebsd-lib-9.2_rc1.ebuild,
+  +files/freebsd-lib-9.2-liblink.patch:
+  Build our own libelf, bug #479494 by Yuta SATOH
 
   11 Aug 2013; Alexis Ballier <aballier@gentoo.org> freebsd-lib-9.2_rc1.ebuild:
   update /usr/src/sys symlink after recent changes to -sources
diff --git a/sys-freebsd/freebsd-lib/Manifest b/sys-freebsd/freebsd-lib/Manifest
index e189876974bd..060ce53140ca 100644
--- a/sys-freebsd/freebsd-lib/Manifest
+++ b/sys-freebsd/freebsd-lib/Manifest
@@ -20,6 +20,7 @@ AUX freebsd-lib-9.0-opieincludes.patch 4495 SHA256 0868e7454053170c3399f1a03a68f
 AUX freebsd-lib-9.1-.eh_frame_hdr-fix.patch 695 SHA256 6c6d7a958c989edc6ee76c5b9c2146fa449adda11c3b89b550780c7a78d93190 SHA512 c40270e8890a1152a6f2e705461ac64f8cc44e6d0306d895a0d146017d4fe3553853de88178e0744fc1be4197a4eb35b578c68593c80467dd8cf15c35720413d WHIRLPOOL 1fa3c5cdba333951b918eb5c1eb793ab49921268a6a397e38f2adad383c2c03ccf382892ed8d44e2480f8ca891ce3c3a0b122a026cbf232058ac3bcf2f2d5133
 AUX freebsd-lib-9.1-aligned_alloc.patch 1355 SHA256 379880b3e1be34a145d6388481645af5212eea7830285a7660a56a02e47dc608 SHA512 d9ac6008650efcd02ff1a0f64ac486e413c926681082d4ab9c1cb5abfbf1070e44b723e685a0b5b0e7159ab9071d85c5ee08c9063c9dcda470dfaa06a29391bc WHIRLPOOL fd80089b4b31f0a0d4dcb912d5dde74b3eb9e0530a3dc145f40ac476ef89ae256a0847123b44a0a59966c28f7f7529c401ce0dab493400a7aa24513989853e36
 AUX freebsd-lib-9.1-rmgssapi.patch 699 SHA256 0dc94a565f140beca0800446c72bd874f99c56125181f7a037154dcd898d2615 SHA512 cb0b292cca0c321ed72b1a792a3975be239303b3990efc6665b0c960dfe17fdbb4529405286c0a956c4b4711462d2ee9d7d1c9d343ad3246b43c49edfc87dae0 WHIRLPOOL 55adff8c3436959b4545ba54c0eff3cd640dd4f0d0871bd66dad2501c04e84eb24f27b882dde9050b088dadecc9af6049493e848a1d508646149075180c8c414
+AUX freebsd-lib-9.2-liblink.patch 1420 SHA256 c8fa4315a89d3acc378c89ecd778a43ab5b4824783ef19af1082732f6b2dc3a4 SHA512 88e564e13399c88eb238a10bea1a4959c62a6af6d3c9c41c331878e0c6a1680767ebdb58f555a9f1145a2c47cdfc65e3f98387947f1941327b800cb18983cda4 WHIRLPOOL b6f2654138e9e46b0fe193b1488150e4f84c5f1b14ab1a8f21348a4158570f99499e94c54acaf8244fc1d2cc0775a40c77585b88387cf2a73ed33062335c5255
 AUX freebsd-lib-bsdxml.patch 339 SHA256 c1ac47d6c7176475f0f4b86bb17288a980b44a799fb6f4e7b1920f69e0447dc9 SHA512 8d14ebc848426cf600cf2206f60b91d3a5e555c738be8bb84707dcf2455be98ea3dd0a6929495b93027f71097ff0232cc85c16be4d5381a167ee0aae5a14d542 WHIRLPOOL dbafb2f98b56cac9c3ec1377c7fae40935ca3c8b1116665ce36b82a55242dbead24dc4fc38d0268cf5af82e7f908543f1376fdd3f7d847bd92dc51438a3934ee
 AUX freebsd-lib-bsdxml2expat.patch 708 SHA256 0c3ec3657155c5032479181119c488d43a479ab0dfe7a7d7ed0dabce16853e85 SHA512 d3b321062886ee636a09af4b8714ae90317c17eb954a3d491cd21ca90605e26491033df4d6f02a517eda423783db74dad16adf7ee1bdc5557392cc70218ee9c7 WHIRLPOOL 5c262c59aee9e642d3a8929a453b56c7a55ba60f3011d6ac07b750a30297eb992a564ba4db18714b7eac58bbe3ded1ff4249150128947d25dd1344e59e16c9cb
 AUX freebsd-lib-includes.patch 316 SHA256 be4dd4c905715c2d165be282cf377f799b32ccb76986947bc0bf1b5730b57b06 SHA512 31b7f368a4d3998e42486cb944a001a8371c365276eac94fa8712e29dbe9a13a7756a2fd77fbff87a1f7f4c19b32721c74bbb099f611d46a8c78b73f92d9255e WHIRLPOOL 8c4c2c6d1e9556303520c4cd8f6996f0f24c8b45985d4326db880c187b6db30e914a6e47b40ea4a79d7a309fdd579b39232329daf74758412ac518b0a9d0a317
@@ -60,13 +61,13 @@ DIST freebsd-usbin-9.2_rc1.tar.bz2 2867186 SHA256 e96c38c632e1ff4a98a922709d92c9
 EBUILD freebsd-lib-8.2-r1.ebuild 15816 SHA256 0d7ffdafe52db8b8c0c13741d15cf5ef32d808179bcfd05915afc4b5557a618a SHA512 2623c08ceb9f09d655d742860ca66f26669fb4ac5674e2b36fbe5a737580a16f404ff5abacaa42dd61a5b104805b29cc83f5c37b17f6c94865772cae169dea3a WHIRLPOOL 9b5780f01ca7980b456449fd8bec36e681ee6fb491839d6b7d7655efe31b57c000214e031c389b58e465349a845846860a1d24e8104ea9692bea37a080d7f8af
 EBUILD freebsd-lib-9.1-r10.ebuild 18642 SHA256 41a975236bb1e408812f34298e7397203df33afc6f0d5094aa0ebe42c7eb145f SHA512 fba0026b631d722c69a7fb8d5effcbee66c81970fa971b79a430b2e6657dfa4eea8407bdbf55f737f93d212daf9298320adb296bc58b9c0de141ecc07a926f27 WHIRLPOOL cb575e984e63b133ea9be545ff510183199104b091b742818af3a7c49801b8307d539a9b26e0253fb1d3dfe774c7f76ec12333ae82672bc5d31506a7d9195dd7
 EBUILD freebsd-lib-9.1-r11.ebuild 18835 SHA256 54fadb822046b0172afd21e33d10f4541d68a72dff03245ca34e55f43b1118f4 SHA512 d8163b6e08921ac2e8635df670068a1ec2c5fce2136bee33327d5b89fd5d062bc5c505c6c71738dd9c080f1c18ce1744bdb7a6a398eee0b549b0cd37f3eef99c WHIRLPOOL 2838eaf36618e0770b630a174e34aa5d7647758e6a0503a27a7f58883f21d277c5fed003526c068cb9d7358ee496bc09a079f533c2f9976c3233da07f1f121df
-EBUILD freebsd-lib-9.2_rc1.ebuild 18246 SHA256 61912aaf507ef6f773288e01dcc5460c835bad68e0b4d97fcf8a26431a2b731d SHA512 a87608c4a3b192136fe2dbff1526b5f03993111492bc1ec36ddefbfad9bd6da3b62a2f9f43ce5c4f7b83fd352ef084fbe89184c51eecaa9507a6b33b27f216b1 WHIRLPOOL 194f35d2a3d6d80d899191eae4714d9286a614a521764211ce39a8ddeceae029296bb5f5915076a49596806d9bf5d14ced22da269cc1af4c3788edfc9dbe6168
-MISC ChangeLog 40511 SHA256 9fdd4e84a480b5710789f3c48fcf8a44cee6c5e20ec6bde1fba8afb838b3dafe SHA512 b5c7574b34b3577ec5ad5396c2a919136bcf91c30d326e2dcc90fd03452c038e23b416e08f4c9c83a221cf32b8d24665e6f104f822e8889833a894d169cf8f32 WHIRLPOOL 5a690d9ecf516463210da264def53f199292473cbc9823b3a58811c86e7160706428f5609837753574f083d899067ea02ee9b255a5efdef9321bbac4c67b9fee
+EBUILD freebsd-lib-9.2_rc1.ebuild 18273 SHA256 341109c821c870f9a2951a3b96226e1c68b4179f617b646070abe3eb220c290e SHA512 6f3192a0ea09389c53a70662efa41f046ac1b094d0869a1f50de91eba84319396154ae38bfe2bae9ce4cf66d992f759ee502afa73cce3d4e394185d939cd957e WHIRLPOOL 19e667c438e53672021c85fce0925b891158d86c47568bf099e04d39e6bdb78a4991d169ee95b37b97079699a45de17be22fff9cab8abdfc0df7d9582e521963
+MISC ChangeLog 40682 SHA256 246dcda23e4b8298a49656913a906eb9a4752403a5fe88674e42437516d5ab84 SHA512 7c715016dd7c1658b4fa8b5442e8317845d84897868865d52bc1a76ed2054d7ee93002109394ec9e36f478eab89ea68bc56e0998a2bdd5316f215f3db2d90981 WHIRLPOOL c2272022879267881d9d09b822d423130916e3b1b250d40723659e801ec65b51b2b599bd8094c9c4be47bf6252f9a095d4d3b6f97a51a34e9783bfbb678ed1b8
 MISC metadata.xml 410 SHA256 0ea0a391db3018afdf230e293ffedbc313b4a20db703c8c83fdf144a28c6c246 SHA512 de2a427cd8fcc2c0d7c0a1821f4cc916a280d9c0e21d83fdb7c35d110b48e96854baffc7d469e3461c2a6ee81eaec14d105c45cafbd3aaa37100a525bc60b7af WHIRLPOOL 3b2f587e647dafdb68bdb147bb0d5fecea0e728b52eabb61deb2623641117be6ac0871405666d7616ae1d60eaacf0b621cba8175dca463e9344ad83a4daf5865
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlIH604ACgkQvFcC4BYPU0pboQCgo7jQOS3R0loizsyOQy5eoChA
-ezcAoI181+HP7j5p0Pc7WmTh1TWdaqGa
-=sLFI
+iEYEAREIAAYFAlIH9I0ACgkQvFcC4BYPU0ojZACeJnLdcXltEYEvImiNopVe4NWi
+pj8An0se1q1CwmotV5G4YqTXqD2HdCt5
+=9/bO
 -----END PGP SIGNATURE-----
diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-9.2-liblink.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-9.2-liblink.patch
new file mode 100644
index 000000000000..cfc7181e3409
--- /dev/null
+++ b/sys-freebsd/freebsd-lib/files/freebsd-lib-9.2-liblink.patch
@@ -0,0 +1,55 @@
+diff --git a/lib/libdwarf/Makefile b/lib/libdwarf/Makefile
+index 87ce8d4..77d0535 100644
+--- a/lib/libdwarf/Makefile
++++ b/lib/libdwarf/Makefile
+@@ -21,6 +21,7 @@ SRCS=	\
+ INCS=	dwarf.h libdwarf.h
+ 
+ CFLAGS+=	-I${.CURDIR}
++CFLAGS+=	-I${.CURDIR}/../libelf
+ 
+ SHLIB_MAJOR=	3
+ 
+diff --git a/lib/libproc/Makefile b/lib/libproc/Makefile
+index e20e00a..77d46d7 100644
+--- a/lib/libproc/Makefile
++++ b/lib/libproc/Makefile
+@@ -12,9 +12,13 @@ SRCS=	proc_bkpt.c		\
+ INCS=	libproc.h
+ 
+ CFLAGS+=	-I${.CURDIR}
++CFLAGS+=	-I${.CURDIR}/../libelf
+ 
+ SHLIB_MAJOR=	2
+ 
+ WITHOUT_MAN=
+ 
++LDADD+=		-lelf
++LDFLAGS+=	-L${.OBJDIR}/../libelf
++
+ .include <bsd.lib.mk>
+diff --git a/lib/librtld_db/Makefile b/lib/librtld_db/Makefile
+index 783fb8b..62e7c60 100644
+--- a/lib/librtld_db/Makefile
++++ b/lib/librtld_db/Makefile
+@@ -10,5 +10,8 @@ SRCS=		rtld_db.c
+ INCS=		rtld_db.h
+ 
+ CFLAGS+= -I${.CURDIR}
++CFLAGS+= -I${.CURDIR}/../libelf
++LDADD+= -lutil -lproc
++LDFLAGS+= -L${.OBJDIR}/../libutil -L${.OBJDIR}/../libproc
+ 
+ .include <bsd.lib.mk>
+diff -uNr lib.old/libprocstat/Makefile lib/libprocstat/Makefile
+--- a/lib/libprocstat/Makefile	2013-08-11 16:00:47.000000000 -0400
++++ b/lib/libprocstat/Makefile	2013-08-11 16:18:19.000000000 -0400
+@@ -17,6 +17,8 @@
+ SYMBOL_MAPS=	${.CURDIR}/Symbol.map
+ 
+ INCS=		libprocstat.h
++CFLAGS+=	-I${.CURDIR}/../libelf
++LDFLAGS+=       -L${.OBJDIR}/../libelf
+ CFLAGS+=	-I. -I${.CURDIR} -D_KVM_VNODE
+ SHLIB_MAJOR=	1
+ 
diff --git a/sys-freebsd/freebsd-lib/freebsd-lib-9.2_rc1.ebuild b/sys-freebsd/freebsd-lib/freebsd-lib-9.2_rc1.ebuild
index fb5edda93450..08c31e24f02c 100644
--- a/sys-freebsd/freebsd-lib/freebsd-lib-9.2_rc1.ebuild
+++ b/sys-freebsd/freebsd-lib/freebsd-lib-9.2_rc1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.2_rc1.ebuild,v 1.4 2013/08/11 19:51:40 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.2_rc1.ebuild,v 1.5 2013/08/11 20:31:07 aballier Exp $
 
 EAPI=5
 
@@ -34,6 +34,7 @@ if [ "${CATEGORY#*cross-}" = "${CATEGORY}" ]; then
 		zfs? ( =sys-freebsd/freebsd-cddl-${RV}* )
 		>=dev-libs/expat-2.0.1
 		!sys-libs/libutempter
+		!dev-libs/libelf
 		!sys-freebsd/freebsd-headers"
 	DEPEND="${RDEPEND}
 		>=sys-devel/flex-2.5.31-r2
@@ -87,7 +88,7 @@ pkg_setup() {
 PATCHES=(
 	"${FILESDIR}/${PN}-6.0-pmc.patch"
 	"${FILESDIR}/${PN}-6.1-csu.patch"
-	"${FILESDIR}/${PN}-9.0-liblink.patch"
+	"${FILESDIR}/${PN}-9.2-liblink.patch"
 	"${FILESDIR}/${PN}-bsdxml2expat.patch"
 	"${FILESDIR}/${PN}-9.0-netware.patch"
 	"${FILESDIR}/${PN}-9.0-bluetooth.patch"
@@ -113,7 +114,7 @@ REMOVE_SUBDIRS="ncurses \
 	libbegemot libbsnmp \
 	libpam libpcap bind libwrap libmagic \
 	libcom_err
-	libelf libedit
+	libedit
 	libstand
 	libgssapi"
 
@@ -251,7 +252,7 @@ bootstrap_libthr() {
 CROSS_SUBDIRS="lib/libc lib/msun gnu/lib/libssp/libssp_nonshared lib/libthr lib/libutil lib/librt"
 
 # What to build for non-default ABIs.
-NON_NATIVE_SUBDIRS="${CROSS_SUBDIRS} gnu/lib/csu lib/libcompiler_rt gnu/lib/libgcc lib/libmd lib/libcrypt lib/libsbuf lib/libcam"
+NON_NATIVE_SUBDIRS="${CROSS_SUBDIRS} gnu/lib/csu lib/libcompiler_rt gnu/lib/libgcc lib/libmd lib/libcrypt lib/libsbuf lib/libcam lib/libelf"
 
 # Subdirs for a native build:
 NATIVE_SUBDIRS="lib gnu/lib/libssp/libssp_nonshared gnu/lib/libregex gnu/lib/csu gnu/lib/libgcc"
@@ -500,7 +501,7 @@ do_install() {
 	# Generate ldscripts for core libraries that will go in /
 	multilib_is_native_abi && \
 		gen_usr_ldscript -a alias cam geom ipsec jail kiconv \
-			kvm m md procstat sbuf thr ufs util
+			kvm m md procstat sbuf thr ufs util elf
 
 	if [[ ${#MULTIBUILD_VARIANTS[@]} -gt 1 ]] ; then
 		cd "${D}/usr/include"