Build our own libelf, bug #479494 by Yuta SATOH

(Portage version: 2.2.0_alpha196/cvs/Linux x86_64, signed Manifest commit with key 160F534A)

3 files changed, 66 insertions, 6 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/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"