From 3f0f5aec1526827e6af54f0b2791d4bcc5489881 Mon Sep 17 00:00:00 2001 From: florian Date: Fri, 28 Dec 2012 09:42:36 +0000 Subject: [PATCH] elfutils: do not check for TEXTREL Signed-off-by: Florian Fainelli git-svn-id: svn://svn.openwrt.org/openwrt/packages@34902 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- libs/elfutils/patches/005-only_libdw_libelf.patch | 14 +++--- libs/elfutils/patches/006-libdw_LIBS.patch | 14 +++--- libs/elfutils/patches/007-no_textrel_checks.patch | 60 +++++++++++++++++++++++ 3 files changed, 72 insertions(+), 16 deletions(-) create mode 100644 libs/elfutils/patches/007-no_textrel_checks.patch diff --git a/libs/elfutils/patches/005-only_libdw_libelf.patch b/libs/elfutils/patches/005-only_libdw_libelf.patch index 93d1dbe12..2e54bfb29 100644 --- a/libs/elfutils/patches/005-only_libdw_libelf.patch +++ b/libs/elfutils/patches/005-only_libdw_libelf.patch @@ -1,7 +1,6 @@ -diff -urN elfutils-0.152/Makefile.am elfutils-0.152.new/Makefile.am ---- elfutils-0.152/Makefile.am 2011-07-06 20:22:31.111366384 +0200 -+++ elfutils-0.152.new/Makefile.am 2011-07-06 20:32:46.081366237 +0200 -@@ -30,8 +30,8 @@ +--- a/Makefile.am ++++ b/Makefile.am +@@ -30,8 +30,8 @@ ACLOCAL_AMFLAGS = -I m4 pkginclude_HEADERS = version.h # Add doc back when we have some real content. @@ -12,10 +11,9 @@ diff -urN elfutils-0.152/Makefile.am elfutils-0.152.new/Makefile.am EXTRA_DIST = elfutils.spec GPG-KEY NOTES EXCEPTION -diff -urN elfutils-0.152/Makefile.in elfutils-0.152.new/Makefile.in ---- elfutils-0.152/Makefile.in 2011-07-06 20:22:31.111366384 +0200 -+++ elfutils-0.152.new/Makefile.in 2011-07-06 20:32:54.211366235 +0200 -@@ -248,8 +248,7 @@ +--- a/Makefile.in ++++ b/Makefile.in +@@ -248,8 +248,7 @@ ACLOCAL_AMFLAGS = -I m4 pkginclude_HEADERS = version.h # Add doc back when we have some real content. diff --git a/libs/elfutils/patches/006-libdw_LIBS.patch b/libs/elfutils/patches/006-libdw_LIBS.patch index 1cca414a5..371b76757 100644 --- a/libs/elfutils/patches/006-libdw_LIBS.patch +++ b/libs/elfutils/patches/006-libdw_LIBS.patch @@ -1,7 +1,6 @@ -diff -urN elfutils-0.152/libdw//Makefile.am elfutils-0.152.new/libdw/Makefile.am ---- elfutils-0.152/libdw//Makefile.am 2010-09-10 15:18:31.000000000 +0200 -+++ elfutils-0.152.new/libdw/Makefile.am 2011-07-07 09:47:25.041354790 +0200 -@@ -108,7 +108,7 @@ +--- a/libdw/Makefile.am ++++ b/libdw/Makefile.am +@@ -108,7 +108,7 @@ libdw.so: $(srcdir)/libdw.map libdw_pic. -Wl,--enable-new-dtags,-rpath,$(pkglibdir) \ -Wl,--version-script,$<,--no-undefined \ -Wl,--whole-archive $(filter-out $<,$^) -Wl,--no-whole-archive\ @@ -10,10 +9,9 @@ diff -urN elfutils-0.152/libdw//Makefile.am elfutils-0.152.new/libdw/Makefile.am if readelf -d $@ | fgrep -q TEXTREL; then exit 1; fi ln -fs $@ $@.$(VERSION) -diff -urN elfutils-0.152/libdw//Makefile.in elfutils-0.152.new/libdw/Makefile.in ---- elfutils-0.152/libdw//Makefile.in 2011-07-06 20:22:31.161366385 +0200 -+++ elfutils-0.152.new/libdw/Makefile.in 2011-07-07 09:47:16.631354792 +0200 -@@ -839,7 +839,7 @@ +--- a/libdw/Makefile.in ++++ b/libdw/Makefile.in +@@ -839,7 +839,7 @@ uninstall-am: uninstall-includeHEADERS u @MUDFLAP_FALSE@ -Wl,--enable-new-dtags,-rpath,$(pkglibdir) \ @MUDFLAP_FALSE@ -Wl,--version-script,$<,--no-undefined \ @MUDFLAP_FALSE@ -Wl,--whole-archive $(filter-out $<,$^) -Wl,--no-whole-archive\ diff --git a/libs/elfutils/patches/007-no_textrel_checks.patch b/libs/elfutils/patches/007-no_textrel_checks.patch new file mode 100644 index 000000000..c3585abf2 --- /dev/null +++ b/libs/elfutils/patches/007-no_textrel_checks.patch @@ -0,0 +1,60 @@ +--- a/libasm/Makefile.am ++++ b/libasm/Makefile.am +@@ -66,7 +66,6 @@ libasm.so: libasm_pic.a libasm.map + -Wl,--version-script,$(srcdir)/libasm.map,--no-undefined \ + -Wl,--soname,$@.$(VERSION) \ + ../libebl/libebl.a ../libelf/libelf.so $(libasm_so_LDLIBS) +- if readelf -d $@ | fgrep -q TEXTREL; then exit 1; fi + ln -fs $@ $@.$(VERSION) + + install: install-am libasm.so +--- a/libasm/Makefile.in ++++ b/libasm/Makefile.in +@@ -648,7 +648,6 @@ uninstall-am: uninstall-libLIBRARIES uni + @MUDFLAP_FALSE@ -Wl,--version-script,$(srcdir)/libasm.map,--no-undefined \ + @MUDFLAP_FALSE@ -Wl,--soname,$@.$(VERSION) \ + @MUDFLAP_FALSE@ ../libebl/libebl.a ../libelf/libelf.so $(libasm_so_LDLIBS) +-@MUDFLAP_FALSE@ if readelf -d $@ | fgrep -q TEXTREL; then exit 1; fi + @MUDFLAP_FALSE@ ln -fs $@ $@.$(VERSION) + + @MUDFLAP_FALSE@install: install-am libasm.so +--- a/libdw/Makefile.am ++++ b/libdw/Makefile.am +@@ -109,7 +109,6 @@ libdw.so: $(srcdir)/libdw.map libdw_pic. + -Wl,--version-script,$<,--no-undefined \ + -Wl,--whole-archive $(filter-out $<,$^) -Wl,--no-whole-archive\ + -ldl $(zip_LIBS) $(LIBS) +- if readelf -d $@ | fgrep -q TEXTREL; then exit 1; fi + ln -fs $@ $@.$(VERSION) + + install: install-am libdw.so +--- a/libdw/Makefile.in ++++ b/libdw/Makefile.in +@@ -840,7 +840,6 @@ uninstall-am: uninstall-includeHEADERS u + @MUDFLAP_FALSE@ -Wl,--version-script,$<,--no-undefined \ + @MUDFLAP_FALSE@ -Wl,--whole-archive $(filter-out $<,$^) -Wl,--no-whole-archive\ + @MUDFLAP_FALSE@ -ldl $(zip_LIBS) $(LIBS) +-@MUDFLAP_FALSE@ if readelf -d $@ | fgrep -q TEXTREL; then exit 1; fi + @MUDFLAP_FALSE@ ln -fs $@ $@.$(VERSION) + + @MUDFLAP_FALSE@install: install-am libdw.so +--- a/libelf/Makefile.am ++++ b/libelf/Makefile.am +@@ -103,7 +103,6 @@ libelf.so: libelf_pic.a libelf.map + $(LINK) -shared -o $@ -Wl,--whole-archive,$<,--no-whole-archive \ + -Wl,--version-script,$(srcdir)/libelf.map,--no-undefined \ + -Wl,--soname,$@.$(VERSION),-z,defs,-z,relro $(libelf_so_LDLIBS) +- if readelf -d $@ | fgrep -q TEXTREL; then exit 1; fi + ln -fs $@ $@.$(VERSION) + + install: install-am libelf.so +--- a/libelf/Makefile.in ++++ b/libelf/Makefile.in +@@ -826,7 +826,6 @@ uninstall-am: uninstall-includeHEADERS u + @MUDFLAP_FALSE@ $(LINK) -shared -o $@ -Wl,--whole-archive,$<,--no-whole-archive \ + @MUDFLAP_FALSE@ -Wl,--version-script,$(srcdir)/libelf.map,--no-undefined \ + @MUDFLAP_FALSE@ -Wl,--soname,$@.$(VERSION),-z,defs,-z,relro $(libelf_so_LDLIBS) +-@MUDFLAP_FALSE@ if readelf -d $@ | fgrep -q TEXTREL; then exit 1; fi + @MUDFLAP_FALSE@ ln -fs $@ $@.$(VERSION) + + @MUDFLAP_FALSE@install: install-am libelf.so -- 2.11.0