Fix linking of utilities with libelf #115385.

Package-Manager: portage-2.0.53

4 files changed, 49 insertions, 7 deletions

diff --git a/dev-libs/elfutils/ChangeLog b/dev-libs/elfutils/ChangeLog
index 8e48e6e398d0..eb42c340e15d 100644
--- a/dev-libs/elfutils/ChangeLog
+++ b/dev-libs/elfutils/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/elfutils
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/elfutils/ChangeLog,v 1.71 2005/12/17 00:34:44 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/elfutils/ChangeLog,v 1.72 2005/12/19 22:57:25 vapier Exp $
+
+  19 Dec 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/elfutils-0.118-libelf-link.patch, elfutils-0.118.ebuild:
+  Fix linking of utilities with libelf #115385.
 
   17 Dec 2005; Mike Frysinger <vapier@gentoo.org>
   +files/elfutils-0.118-PaX-support.patch, elfutils-0.118.ebuild:
diff --git a/dev-libs/elfutils/Manifest b/dev-libs/elfutils/Manifest
index 69574f942578..44c21d4a48ea 100644
--- a/dev-libs/elfutils/Manifest
+++ b/dev-libs/elfutils/Manifest
@@ -1,10 +1,10 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 79d6d9746161cb5045a53e1bba6b8ccb ChangeLog 9530
+MD5 5296f560f36e07915670646692b1d1de ChangeLog 9695
 MD5 0ffad2235361cffdfff3684c03ac028a elfutils-0.108-r1.ebuild 1778
 MD5 b2fd70caba6530bf2fe7b375e0023073 elfutils-0.108.ebuild 1761
-MD5 073900c80a1669090a483ded94c455d9 elfutils-0.118.ebuild 1732
+MD5 66efd35817dc1d72d6a5f85dc0a57fe4 elfutils-0.118.ebuild 1777
 MD5 648c7e7b8f19b21266e556cc6979c0a6 files/digest-elfutils-0.108 143
 MD5 e9fcbbccbeaf0d6f3fdfb27f9563e824 files/digest-elfutils-0.108-r1 145
 MD5 d27a5faa3886979a3b6592519692fe22 files/digest-elfutils-0.118 145
@@ -12,11 +12,12 @@ MD5 1e6460efdb609828aa57b5874813972a files/elfutils-0.101-bswap.patch 849
 MD5 41c5834ecf3d28e43b7fbe3b927e582a files/elfutils-0.108-portability.patch 18453
 MD5 a5bda0a1599fd2232fb0d2cf5f3269a7 files/elfutils-0.108-robustify2.patch 12832
 MD5 c96d3cf0593d10e4994829b1bfe3995b files/elfutils-0.118-PaX-support.patch 954
+MD5 fa69d386e8ae35fe375ce49897b1d3e2 files/elfutils-0.118-libelf-link.patch 1495
 MD5 567094e03359ffc1c95af7356395228d metadata.xml 162
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDo11C2+ySkm8kpY0RAnQeAJ4/ASUImYoocr+hQ+KHnC7zp/b1HQCgkuOQ
-y1hQ5enLDExI7lsq9zAPF30=
-=xTQn
+iD8DBQFDpzsA2+ySkm8kpY0RAm8eAJ9aWkjafgrdyI/Aq+fp75d5yiTWJwCgmJtJ
+bpG0bMmJjKfU2ePcOh7EpwA=
+=O9CL
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/elfutils/elfutils-0.118.ebuild b/dev-libs/elfutils/elfutils-0.118.ebuild
index 177658b6ec41..4e4d572493ab 100644
--- a/dev-libs/elfutils/elfutils-0.118.ebuild
+++ b/dev-libs/elfutils/elfutils-0.118.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/elfutils/elfutils-0.118.ebuild,v 1.3 2005/12/17 00:34:44 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/elfutils/elfutils-0.118.ebuild,v 1.4 2005/12/19 22:57:25 vapier Exp $
 
 inherit eutils
 
@@ -33,6 +33,7 @@ src_unpack() {
 	cd "${S}"
 	EPATCH_SUFFIX="patch" \
 	epatch "${WORKDIR}"/patch/
+	epatch "${FILESDIR}"/${P}-libelf-link.patch
 	epatch "${FILESDIR}"/${P}-PaX-support.patch
 
 	# Needed by ${P}-portability.patch
diff --git a/dev-libs/elfutils/files/elfutils-0.118-libelf-link.patch b/dev-libs/elfutils/files/elfutils-0.118-libelf-link.patch
new file mode 100644
index 000000000000..9bb2d6065f59
--- /dev/null
+++ b/dev-libs/elfutils/files/elfutils-0.118-libelf-link.patch
@@ -0,0 +1,36 @@
+libdw needs libelf
+
+http://bugs.gentoo.org/115385
+
+--- src/Makefile.am
++++ src/Makefile.am
+@@ -93,7 +93,7 @@
+ ld_LDFLAGS = -rdynamic
+ elflint_LDADD  = $(libebl) $(libelf) $(libeu) $(libmudflap) -ldl
+ findtextrel_LDADD = $(libdw) $(libelf) $(libmudflap)
+-addr2line_LDADD = $(libdw) $(libmudflap)
++addr2line_LDADD = $(libdw) $(libelf) $(libmudflap)
+ elfcmp_LDADD = $(libebl) $(libelf) $(libmudflap) -ldl
+ objdump_LDADD  = $(libebl) $(libelf) $(libeu) $(libmudflap) -ldl
+ ranlib_LDADD = $(libelf) $(libeu) $(libmudflap)
+--- tests/Makefile.am
++++ tests/Makefile.am
+@@ -160,12 +160,12 @@
+ get_aranges_LDADD = $(libdw) $(libelf) $(libmudflap)
+ allfcts_LDADD = $(libdw) $(libelf) $(libmudflap)
+ line2addr_no_Wformat = yes
+-line2addr_LDADD = $(libdw) $(libmudflap)
+-addrscopes_LDADD = $(libdw) $(libmudflap)
+-funcscopes_LDADD = $(libdw) $(libmudflap)
+-funcretval_LDADD = $(libdw) $(libmudflap)
+-allregs_LDADD = $(libdw) $(libmudflap)
+-find_prologues_LDADD = $(libdw) $(libmudflap)
++line2addr_LDADD = $(libdw) $(libelf) $(libmudflap)
++addrscopes_LDADD = $(libdw) $(libelf) $(libmudflap)
++funcscopes_LDADD = $(libdw) $(libelf) $(libmudflap)
++funcretval_LDADD = $(libdw) $(libelf) $(libmudflap)
++allregs_LDADD = $(libdw) $(libelf) $(libmudflap)
++find_prologues_LDADD = $(libdw) $(libelf) $(libmudflap)
+ #show_ciefde_LDADD = ../libdwarf/libdwarf.so $(libelf) $(libmudflap)
+ asm_tst1_LDADD = $(libasm) $(libebl) $(libelf) $(libmudflap) -ldl
+ asm_tst2_LDADD = $(libasm) $(libebl) $(libelf) $(libmudflap) -ldl