summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2005-12-19 22:57:25 +0000
committerMike Frysinger <vapier@gentoo.org>2005-12-19 22:57:25 +0000
commit71bd64a6b04e182ce33e1447c9464d9f92ddf820 (patch)
tree4007a4d502bc28a679f825ea26d83b7cb3279346 /dev-libs
parentRemove some old ebuilds, minor QA changes to 1.2.11-r2 and 1.2.12 version bum... (diff)
downloadgentoo-2-71bd64a6b04e182ce33e1447c9464d9f92ddf820.tar.gz
gentoo-2-71bd64a6b04e182ce33e1447c9464d9f92ddf820.tar.bz2
gentoo-2-71bd64a6b04e182ce33e1447c9464d9f92ddf820.zip
Fix linking of utilities with libelf #115385.
(Portage version: 2.0.53)
Diffstat (limited to 'dev-libs')
-rw-r--r--dev-libs/elfutils/ChangeLog6
-rw-r--r--dev-libs/elfutils/elfutils-0.118.ebuild3
-rw-r--r--dev-libs/elfutils/files/elfutils-0.118-libelf-link.patch36
3 files changed, 43 insertions, 2 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/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