| 1 |
commit: 77949d822b6a39e38b4b620495547b08a5638885 |
| 2 |
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon May 20 21:37:13 2013 +0000 |
| 4 |
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon May 20 21:37:13 2013 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/hardened-dev.git;a=commit;h=77949d82 |
| 7 |
|
| 8 |
dev-libs/elfutils: use argp-standalone |
| 9 |
|
| 10 |
--- |
| 11 |
dev-libs/elfutils/elfutils-0.155.ebuild | 6 ++- |
| 12 |
.../elfutils-0.155-link-argp-standalone.patch | 56 ++++++++++++++++++++ |
| 13 |
2 files changed, 60 insertions(+), 2 deletions(-) |
| 14 |
|
| 15 |
diff --git a/dev-libs/elfutils/elfutils-0.155.ebuild b/dev-libs/elfutils/elfutils-0.155.ebuild |
| 16 |
index a2129bd..173a297 100644 |
| 17 |
--- a/dev-libs/elfutils/elfutils-0.155.ebuild |
| 18 |
+++ b/dev-libs/elfutils/elfutils-0.155.ebuild |
| 19 |
@@ -31,12 +31,14 @@ DEPEND="${RDEPEND} |
| 20 |
sys-devel/m4" |
| 21 |
|
| 22 |
src_prepare() { |
| 23 |
+ epatch "${FILESDIR}"/${PN}-0.118-PaX-support.patch |
| 24 |
+ epatch "${DISTDIR}"/${P}-{portability,robustify}.patch |
| 25 |
+ |
| 26 |
epatch "${FILESDIR}"/${PN}-0.155-fallback-mempcpy.patch |
| 27 |
epatch "${FILESDIR}"/${PN}-0.155-fallback-assert.patch |
| 28 |
+ epatch "${FILESDIR}"/${PN}-0.155-link-argp-standalone.patch |
| 29 |
eautoreconf |
| 30 |
|
| 31 |
- epatch "${FILESDIR}"/${PN}-0.118-PaX-support.patch |
| 32 |
- epatch "${DISTDIR}"/${P}-{portability,robustify}.patch |
| 33 |
sed -i -e 's:-Werror::g' $(find -name Makefile.in) || die |
| 34 |
use test || sed -i -e 's: tests::' Makefile.in #226349 |
| 35 |
use static-libs || sed -i -e '/^lib_LIBRARIES/s:=.*:=:' -e '/^%.os/s:%.o$::' lib{asm,dw,elf}/Makefile.in |
| 36 |
|
| 37 |
diff --git a/dev-libs/elfutils/files/elfutils-0.155-link-argp-standalone.patch b/dev-libs/elfutils/files/elfutils-0.155-link-argp-standalone.patch |
| 38 |
new file mode 100644 |
| 39 |
index 0000000..4c0e341 |
| 40 |
--- /dev/null |
| 41 |
+++ b/dev-libs/elfutils/files/elfutils-0.155-link-argp-standalone.patch |
| 42 |
@@ -0,0 +1,56 @@ |
| 43 |
+diff -Naur elfutils-0.155.orig/libdw/Makefile.am elfutils-0.155/libdw/Makefile.am |
| 44 |
+--- elfutils-0.155.orig/libdw/Makefile.am 2012-08-27 18:27:31.000000000 +0000 |
| 45 |
++++ elfutils-0.155/libdw/Makefile.am 2013-05-19 19:53:39.943546921 +0000 |
| 46 |
+@@ -111,7 +111,7 @@ |
| 47 |
+ -Wl,--enable-new-dtags,-rpath,$(pkglibdir) \ |
| 48 |
+ -Wl,--version-script,$<,--no-undefined \ |
| 49 |
+ -Wl,--whole-archive $(filter-out $<,$^) -Wl,--no-whole-archive\ |
| 50 |
+- -ldl $(zip_LIBS) |
| 51 |
++ -ldl $(zip_LIBS) -largp |
| 52 |
+ if readelf -d $@ | fgrep -q TEXTREL; then exit 1; fi |
| 53 |
+ ln -fs $@ $@.$(VERSION) |
| 54 |
+ |
| 55 |
+diff -Naur elfutils-0.155.orig/src/Makefile.am elfutils-0.155/src/Makefile.am |
| 56 |
+--- elfutils-0.155.orig/src/Makefile.am 2012-08-27 18:29:31.000000000 +0000 |
| 57 |
++++ elfutils-0.155/src/Makefile.am 2013-05-19 19:59:30.707535687 +0000 |
| 58 |
+@@ -95,26 +95,26 @@ |
| 59 |
+ # XXX While the file is not finished, don't warn about this |
| 60 |
+ ldgeneric_no_Wunused = yes |
| 61 |
+ |
| 62 |
+-readelf_LDADD = $(libdw) $(libebl) $(libelf) $(libeu) $(libmudflap) -ldl |
| 63 |
+-nm_LDADD = $(libdw) $(libebl) $(libelf) $(libeu) $(libmudflap) -ldl \ |
| 64 |
++readelf_LDADD = $(libdw) $(libebl) $(libelf) $(libeu) $(libmudflap) -ldl -largp |
| 65 |
++nm_LDADD = $(libdw) $(libebl) $(libelf) $(libeu) $(libmudflap) -ldl -largp \ |
| 66 |
+ $(demanglelib) |
| 67 |
+-size_LDADD = $(libelf) $(libeu) $(libmudflap) |
| 68 |
+-strip_LDADD = $(libebl) $(libelf) $(libeu) $(libmudflap) -ldl |
| 69 |
+-ld_LDADD = $(libebl) $(libelf) $(libeu) $(libmudflap) -ldl |
| 70 |
++size_LDADD = $(libelf) $(libeu) $(libmudflap) -largp |
| 71 |
++strip_LDADD = $(libebl) $(libelf) $(libeu) $(libmudflap) -ldl -largp |
| 72 |
++ld_LDADD = $(libebl) $(libelf) $(libeu) $(libmudflap) -ldl -largp |
| 73 |
+ if NATIVE_LD |
| 74 |
+ # -ldl is always needed for libebl. |
| 75 |
+ ld_LDADD += libld_elf.a |
| 76 |
+ endif |
| 77 |
+ ld_LDFLAGS = -rdynamic |
| 78 |
+-elflint_LDADD = $(libebl) $(libelf) $(libeu) $(libmudflap) -ldl |
| 79 |
+-findtextrel_LDADD = $(libdw) $(libelf) $(libmudflap) |
| 80 |
+-addr2line_LDADD = $(libdw) $(libelf) $(libmudflap) |
| 81 |
+-elfcmp_LDADD = $(libebl) $(libelf) $(libmudflap) -ldl |
| 82 |
+-objdump_LDADD = $(libasm) $(libebl) $(libelf) $(libeu) $(libmudflap) -ldl |
| 83 |
+-ranlib_LDADD = libar.a $(libelf) $(libeu) $(libmudflap) |
| 84 |
+-strings_LDADD = $(libelf) $(libeu) $(libmudflap) |
| 85 |
+-ar_LDADD = libar.a $(libelf) $(libeu) $(libmudflap) |
| 86 |
+-unstrip_LDADD = $(libebl) $(libelf) $(libdw) $(libeu) $(libmudflap) -ldl |
| 87 |
++elflint_LDADD = $(libebl) $(libelf) $(libeu) $(libmudflap) -ldl -largp |
| 88 |
++findtextrel_LDADD = $(libdw) $(libelf) $(libmudflap) -largp |
| 89 |
++addr2line_LDADD = $(libdw) $(libelf) $(libmudflap) -largp |
| 90 |
++elfcmp_LDADD = $(libebl) $(libelf) $(libmudflap) -ldl -largp |
| 91 |
++objdump_LDADD = $(libasm) $(libebl) $(libelf) $(libeu) $(libmudflap) -ldl -largp |
| 92 |
++ranlib_LDADD = libar.a $(libelf) $(libeu) $(libmudflap) -largp |
| 93 |
++strings_LDADD = $(libelf) $(libeu) $(libmudflap) -largp |
| 94 |
++ar_LDADD = libar.a $(libelf) $(libeu) $(libmudflap) -largp |
| 95 |
++unstrip_LDADD = $(libebl) $(libelf) $(libdw) $(libeu) $(libmudflap) -ldl -largp |
| 96 |
+ |
| 97 |
+ ldlex.o: ldscript.c |
| 98 |
+ ldlex_no_Werror = yes |
Archives