From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 2B3271381F3 for ; Mon, 20 May 2013 21:37:52 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 06384E0844; Mon, 20 May 2013 21:37:48 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 6FCDAE0844 for ; Mon, 20 May 2013 21:37:47 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6042E33E38B for ; Mon, 20 May 2013 21:37:46 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id F0124E4404 for ; Mon, 20 May 2013 21:37:44 +0000 (UTC) From: "Anthony G. Basile" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Anthony G. Basile" Message-ID: <1369085833.77949d822b6a39e38b4b620495547b08a5638885.blueness@gentoo> Subject: [gentoo-commits] proj/hardened-dev:uclibc commit in: dev-libs/elfutils/files/, dev-libs/elfutils/ X-VCS-Repository: proj/hardened-dev X-VCS-Files: dev-libs/elfutils/elfutils-0.155.ebuild dev-libs/elfutils/files/elfutils-0.155-link-argp-standalone.patch X-VCS-Directories: dev-libs/elfutils/files/ dev-libs/elfutils/ X-VCS-Committer: blueness X-VCS-Committer-Name: Anthony G. Basile X-VCS-Revision: 77949d822b6a39e38b4b620495547b08a5638885 X-VCS-Branch: uclibc Date: Mon, 20 May 2013 21:37:44 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: fcc43748-f282-4392-83c1-9ab0e7042bb6 X-Archives-Hash: 31c24aae93223409fe81e0a2346a9dfa commit: 77949d822b6a39e38b4b620495547b08a5638885 Author: Anthony G. Basile gentoo org> AuthorDate: Mon May 20 21:37:13 2013 +0000 Commit: Anthony G. Basile gentoo org> CommitDate: Mon May 20 21:37:13 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/hardened-dev.git;a=commit;h=77949d82 dev-libs/elfutils: use argp-standalone --- dev-libs/elfutils/elfutils-0.155.ebuild | 6 ++- .../elfutils-0.155-link-argp-standalone.patch | 56 ++++++++++++++++++++ 2 files changed, 60 insertions(+), 2 deletions(-) diff --git a/dev-libs/elfutils/elfutils-0.155.ebuild b/dev-libs/elfutils/elfutils-0.155.ebuild index a2129bd..173a297 100644 --- a/dev-libs/elfutils/elfutils-0.155.ebuild +++ b/dev-libs/elfutils/elfutils-0.155.ebuild @@ -31,12 +31,14 @@ DEPEND="${RDEPEND} sys-devel/m4" src_prepare() { + epatch "${FILESDIR}"/${PN}-0.118-PaX-support.patch + epatch "${DISTDIR}"/${P}-{portability,robustify}.patch + epatch "${FILESDIR}"/${PN}-0.155-fallback-mempcpy.patch epatch "${FILESDIR}"/${PN}-0.155-fallback-assert.patch + epatch "${FILESDIR}"/${PN}-0.155-link-argp-standalone.patch eautoreconf - epatch "${FILESDIR}"/${PN}-0.118-PaX-support.patch - epatch "${DISTDIR}"/${P}-{portability,robustify}.patch sed -i -e 's:-Werror::g' $(find -name Makefile.in) || die use test || sed -i -e 's: tests::' Makefile.in #226349 use static-libs || sed -i -e '/^lib_LIBRARIES/s:=.*:=:' -e '/^%.os/s:%.o$::' lib{asm,dw,elf}/Makefile.in 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 new file mode 100644 index 0000000..4c0e341 --- /dev/null +++ b/dev-libs/elfutils/files/elfutils-0.155-link-argp-standalone.patch @@ -0,0 +1,56 @@ +diff -Naur elfutils-0.155.orig/libdw/Makefile.am elfutils-0.155/libdw/Makefile.am +--- elfutils-0.155.orig/libdw/Makefile.am 2012-08-27 18:27:31.000000000 +0000 ++++ elfutils-0.155/libdw/Makefile.am 2013-05-19 19:53:39.943546921 +0000 +@@ -111,7 +111,7 @@ + -Wl,--enable-new-dtags,-rpath,$(pkglibdir) \ + -Wl,--version-script,$<,--no-undefined \ + -Wl,--whole-archive $(filter-out $<,$^) -Wl,--no-whole-archive\ +- -ldl $(zip_LIBS) ++ -ldl $(zip_LIBS) -largp + if readelf -d $@ | fgrep -q TEXTREL; then exit 1; fi + ln -fs $@ $@.$(VERSION) + +diff -Naur elfutils-0.155.orig/src/Makefile.am elfutils-0.155/src/Makefile.am +--- elfutils-0.155.orig/src/Makefile.am 2012-08-27 18:29:31.000000000 +0000 ++++ elfutils-0.155/src/Makefile.am 2013-05-19 19:59:30.707535687 +0000 +@@ -95,26 +95,26 @@ + # XXX While the file is not finished, don't warn about this + ldgeneric_no_Wunused = yes + +-readelf_LDADD = $(libdw) $(libebl) $(libelf) $(libeu) $(libmudflap) -ldl +-nm_LDADD = $(libdw) $(libebl) $(libelf) $(libeu) $(libmudflap) -ldl \ ++readelf_LDADD = $(libdw) $(libebl) $(libelf) $(libeu) $(libmudflap) -ldl -largp ++nm_LDADD = $(libdw) $(libebl) $(libelf) $(libeu) $(libmudflap) -ldl -largp \ + $(demanglelib) +-size_LDADD = $(libelf) $(libeu) $(libmudflap) +-strip_LDADD = $(libebl) $(libelf) $(libeu) $(libmudflap) -ldl +-ld_LDADD = $(libebl) $(libelf) $(libeu) $(libmudflap) -ldl ++size_LDADD = $(libelf) $(libeu) $(libmudflap) -largp ++strip_LDADD = $(libebl) $(libelf) $(libeu) $(libmudflap) -ldl -largp ++ld_LDADD = $(libebl) $(libelf) $(libeu) $(libmudflap) -ldl -largp + if NATIVE_LD + # -ldl is always needed for libebl. + ld_LDADD += libld_elf.a + endif + ld_LDFLAGS = -rdynamic +-elflint_LDADD = $(libebl) $(libelf) $(libeu) $(libmudflap) -ldl +-findtextrel_LDADD = $(libdw) $(libelf) $(libmudflap) +-addr2line_LDADD = $(libdw) $(libelf) $(libmudflap) +-elfcmp_LDADD = $(libebl) $(libelf) $(libmudflap) -ldl +-objdump_LDADD = $(libasm) $(libebl) $(libelf) $(libeu) $(libmudflap) -ldl +-ranlib_LDADD = libar.a $(libelf) $(libeu) $(libmudflap) +-strings_LDADD = $(libelf) $(libeu) $(libmudflap) +-ar_LDADD = libar.a $(libelf) $(libeu) $(libmudflap) +-unstrip_LDADD = $(libebl) $(libelf) $(libdw) $(libeu) $(libmudflap) -ldl ++elflint_LDADD = $(libebl) $(libelf) $(libeu) $(libmudflap) -ldl -largp ++findtextrel_LDADD = $(libdw) $(libelf) $(libmudflap) -largp ++addr2line_LDADD = $(libdw) $(libelf) $(libmudflap) -largp ++elfcmp_LDADD = $(libebl) $(libelf) $(libmudflap) -ldl -largp ++objdump_LDADD = $(libasm) $(libebl) $(libelf) $(libeu) $(libmudflap) -ldl -largp ++ranlib_LDADD = libar.a $(libelf) $(libeu) $(libmudflap) -largp ++strings_LDADD = $(libelf) $(libeu) $(libmudflap) -largp ++ar_LDADD = libar.a $(libelf) $(libeu) $(libmudflap) -largp ++unstrip_LDADD = $(libebl) $(libelf) $(libdw) $(libeu) $(libmudflap) -ldl -largp + + ldlex.o: ldscript.c + ldlex_no_Werror = yes