commit: 5699f85057604a6493d5ffa346beb5776301d776 Author: Aric Belsito <lluixhi <AT> gmail <DOT> com> AuthorDate: Tue Aug 8 20:08:41 2017 +0000 Commit: Aric Belsito <lluixhi <AT> gmail <DOT> com> CommitDate: Tue Aug 8 20:08:41 2017 +0000 URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=5699f850
dev-libs/elfutils: version bump to 0.170 dev-libs/elfutils/Manifest | 5 +- dev-libs/elfutils/elfutils-0.169-r1.ebuild | 2 +- ...utils-0.169-r1.ebuild => elfutils-0.170.ebuild} | 10 +- .../files/elfutils-0.170-musl-obstack-fts.patch | 102 +++++++++++++++++++++ 4 files changed, 112 insertions(+), 7 deletions(-) diff --git a/dev-libs/elfutils/Manifest b/dev-libs/elfutils/Manifest index 7a54609..3c67364 100644 --- a/dev-libs/elfutils/Manifest +++ b/dev-libs/elfutils/Manifest @@ -5,8 +5,11 @@ AUX elfutils-0.166-musl-utils.patch 5703 SHA256 a8d7e456abe29e5ade35832d872eb56e AUX elfutils-0.168-musl-obstack-fts.patch 3866 SHA256 f3f0993948744f4d18f2618b221edfb1bdb5e44afb25d84fb8017115acd7970d SHA512 a93faea92bcdc9bff7fffabc35626213b8efa7003b893753480250fab7295aabd415fbf947f09ebd9e0ab8037582e4fe5a689e2910845223b2f00eabb2f529c1 WHIRLPOOL ee8745e65281f9cd2aae1bfee9d6e9f9e20677ac4f013f79436f8749f43ed897a98744d78e090de6561737b2af26063743e93d8b7686fef02cc5792fdc3754bd AUX elfutils-0.168-musl-utils.patch 3833 SHA256 5f939b8e9c19ed84239ca30715c5117e42a8a0b46e854311440dcad5508bfb46 SHA512 b3ab2c6f8e04507580feedddaf7c0a260c70d96550d7befb4e060f1b7619c69ceddff43dae407fd677be939c48556bfd253d5bedd619e85fd8418a6fdcab0b01 WHIRLPOOL 22751e586c78479bc087a16668fcd4f0bb37c019795fbfd4eb52fb7cc5784259868252a48b70429339a659e97815050717ed34cf7dee61661b0cb26925efdd4b AUX elfutils-0.169-musl-libs.patch 3579 SHA256 05de076b4bbf8b0db103b943841825868e25b28fdd057d1d534d50180ec22bdd SHA512 401df45eea61a9acea175676d184983758915ab68dc37d72332c73b9ae2fab69094bb24bd9db9d79ad4f7b60f67cbac518f79cbb33cad9a6d55289728116bad3 WHIRLPOOL 71ae07ea3e4206881e16e0da51a82285ea51efecafa6897df175b0a8aa777e7479d1a2c0b130d0a1f3c95c8f5aec34e6a046f0a85c94b21cd2296c4a89763025 +AUX elfutils-0.170-musl-obstack-fts.patch 3919 SHA256 165841d5e340c8b5c1afcda2e5a97e75e3e84e5a51b0c9339a5dfe7f030df6ec SHA512 13ca0d13c314a39789d4c8946f351b0ab7efe365637baab370fd5edc7e6f902c88f8d4fe70b8185ee0c33e2d7e6b583b90b1549c83921d895af1cd629932a851 WHIRLPOOL 4eb213b4212eb35ba3ebc3fed75ab1b47c028d2d7f07c93427cd0eef547c470b2938177d734eb3cf4f81e2416b8ac1416d9ca7114a1952f93829b53b5d4587a4 DIST elfutils-0.166.tar.bz2 6496225 SHA256 3c056914c8a438b210be0d790463b960fc79d234c3f05ce707cbff80e94cba30 SHA512 543e8f9fbebbef86c40b1d6dc93da04a8431071aad636b70e7a1b9536450990b237d100d354c29fd0c3605074b7a0621f5bdaab4c2664be42b2912ad283bc614 WHIRLPOOL 4de083bbb397235dd46c2ba6e0cbb615825c13d7e8413015d5ff08d72deae1d9a508c0f6e5f90e27cc709870064bc53a51b2a681f2a9b80e1f658bb7dc475f8d DIST elfutils-0.169.tar.bz2 8067758 SHA256 9412fac7b30872b738bc1ed1ebcaed54493c26ef9a67887913498c17b10f3bc2 SHA512 0a81a20bb2aff533d035d6b76f1403437b2e11bce390db57e34b8c26e4b9b3150346d83dddcbfbbdc58063f046ca3223508dba35c6ce88e375d201e7a777a8b9 WHIRLPOOL dc4f689b403160272dccb1e306ee3584f6d06156d3318d745bba46f9b4a31a477795223233ffb420b096b1c196aba09492e4ab5803f6150326b48e1045f92e06 +DIST elfutils-0.170.tar.bz2 8358001 SHA256 1f844775576b79bdc9f9c717a50058d08620323c1e935458223a12f249c9e066 SHA512 aca0b5e271138eaf86e36505ffb101181207b151e833e6cd7c18986ac50678542a5ecd2250f8dd6923ca497142f197c8b08fd225e4130b16b6203c24013d6d28 WHIRLPOOL ebb3069aa52e49b7e137c722ac490b12393e0c54656d6d7476193eaa4253b48209e62e4babd4819a52cf5a9f3a1a6f56945eb776f014df9cbd841aa392e94823 EBUILD elfutils-0.166.ebuild 2534 SHA256 871895d2063eb8de76d8a53097d44744d5a648b2a11b04e930f08a37dc4b0b4e SHA512 57f011f6758371eb072a0592d51e89e9ced73d795466a2c5158ebde65cc1d55ebe5f2e1e1bb2faec1f9891d1234d7ff5229fab82505d317678b01b204e3c4e17 WHIRLPOOL 4ea30b8d36cb3f50e997316312f41b916e3b2a34c6d5e91e350de34e61933b0bae2e7e930d6e012528d779b46f169625a5528cf6e210c113dab32f6543ad6483 -EBUILD elfutils-0.169-r1.ebuild 2145 SHA256 b17f29458eacd12384c1d92a415505c89efa20b84ffc51ee6b7c95b533e0f14c SHA512 eded3a14e0f4459759b26b13d2160439f56a546c86f0ad7df2e458ff93d2bc4c4ae98363dfc0347ac1565b9b8c1d517b7ed5f072d7e891b11f22280b58f63c17 WHIRLPOOL 6e323d896321d57d2fb6078685d65a489456f5a8db06155a80d3f706e658252430c1240daf8cc175ac0b90825fe568673855d761b128c55d61682ec6e456623f +EBUILD elfutils-0.169-r1.ebuild 2141 SHA256 5e4413bf86725d52069aa4e5cd1917f74736cca8a16fe3c70f1f6b20146d5003 SHA512 97782c1788311ec49db7802c80a85d37b17701a7902e4849d98df8071c91b263c748db76e13bde98ea988aba7d963389831fcda2f0c038d576b8f45bbaff48e3 WHIRLPOOL a65d1cb70b0e08b3588e38a3d4c8e3ff45b02f7eb79bed64f587b3416a5f1c3cf1a3a289206507018661dfead07ad8769d0c86fb9c22d39b2f6aed436d708a7c +EBUILD elfutils-0.170.ebuild 2146 SHA256 0ea284cdabb64dffbb57c66e907a837a650f4bacc0d087bb6572e9564b6d3ada SHA512 e364190e2361b7d1f202ac9cbff7bd456040f96120d1bfa3bc4e26e5c99d7415363db3ca739b144c35aa0ab7df587e98a51d5f6908c92f99fb1107f9f5f09222 WHIRLPOOL 1375bf0546e0f174d13fd027b0d66922f511d5cb23f6fcd22df8a1880020418d7640f0e33a3e70ce92b6609ee07887c8c1949152384ffce705cee81e4fbcb151 MISC metadata.xml 536 SHA256 c3a1800d65f3a779757015fa973588785610daa943a0f5781faf854792ef6993 SHA512 ad625d13a4e5411db4423030760ac51dd44e8da599409bff3e5607c02ed158421e90d7cec8c0b4c0228049b975d3c65a7dbebef78eedd7aca700d38612873cac WHIRLPOOL 4f06288344e8654c048b3ed2aaee8353e0f76a1623eb6936564f65954d52247db57903bdc70f50cd7465681887279024bad5ddd6c9d9c4297a17ef758bd1cf43 diff --git a/dev-libs/elfutils/elfutils-0.169-r1.ebuild b/dev-libs/elfutils/elfutils-0.169-r1.ebuild index 6ab86d2..c170f0a 100644 --- a/dev-libs/elfutils/elfutils-0.169-r1.ebuild +++ b/dev-libs/elfutils/elfutils-0.169-r1.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://sourceware.org/elfutils/ftp/${PV}/${P}.tar.bz2"; LICENSE="|| ( GPL-2+ LGPL-3+ ) utils? ( GPL-3+ )" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux" +KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux" IUSE="bzip2 lzma nls static-libs test +threads +utils" RDEPEND=">=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] diff --git a/dev-libs/elfutils/elfutils-0.169-r1.ebuild b/dev-libs/elfutils/elfutils-0.170.ebuild similarity index 86% copy from dev-libs/elfutils/elfutils-0.169-r1.ebuild copy to dev-libs/elfutils/elfutils-0.170.ebuild index 6ab86d2..01dd7ff 100644 --- a/dev-libs/elfutils/elfutils-0.169-r1.ebuild +++ b/dev-libs/elfutils/elfutils-0.170.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://sourceware.org/elfutils/ftp/${PV}/${P}.tar.bz2"; LICENSE="|| ( GPL-2+ LGPL-3+ ) utils? ( GPL-3+ )" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux" IUSE="bzip2 lzma nls static-libs test +threads +utils" RDEPEND=">=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] @@ -28,13 +28,13 @@ DEPEND="${RDEPEND} sys-libs/obstack-standalone )" +PATCHES=("${FILESDIR}"/${PN}-0.118-PaX-support.patch) + src_prepare() { default - epatch "${FILESDIR}"/${PN}-0.118-PaX-support.patch - # Add MUSL patches - epatch "${FILESDIR}"/${PN}-0.168-musl-obstack-fts.patch - epatch "${FILESDIR}"/${P}-musl-libs.patch + epatch "${FILESDIR}"/${P}-musl-obstack-fts.patch + epatch "${FILESDIR}"/${PN}-0.169-musl-libs.patch epatch "${FILESDIR}"/${PN}-0.168-musl-utils.patch eautoreconf diff --git a/dev-libs/elfutils/files/elfutils-0.170-musl-obstack-fts.patch b/dev-libs/elfutils/files/elfutils-0.170-musl-obstack-fts.patch new file mode 100644 index 0000000..e2ba29a --- /dev/null +++ b/dev-libs/elfutils/files/elfutils-0.170-musl-obstack-fts.patch @@ -0,0 +1,102 @@ +diff -Naur elfutils-0.170.orig/configure.ac elfutils-0.170/configure.ac +--- elfutils-0.170.orig/configure.ac 2017-08-08 12:51:02.675540308 -0700 ++++ elfutils-0.170/configure.ac 2017-08-08 13:00:47.322520736 -0700 +@@ -385,6 +385,60 @@ + fi + AC_SUBST([argp_LDADD]) + ++dnl Check if we have fts available from our libc ++AC_LINK_IFELSE( ++ [AC_LANG_PROGRAM( ++ [#if !defined(__x86_64__) ++ #undef _FILE_OFFSET_BITS ++ #define _FILE_OFFSET_BITS 32 ++ #endif ++ #include <fts.h>], ++ [FTS* fts = 0; return fts_close(fts); return 0;] ++ )], ++ [libc_has_fts="true"], ++ [libc_has_fts="false"] ++) ++ ++dnl If our libc doesn't provide fts, then test for libfts ++if test "$libc_has_fts" = "false" ; then ++ AC_MSG_WARN("libc does not have fts") ++ AC_CHECK_LIB([fts], [fts_close], [have_fts="true"], [have_fts="false"]) ++ ++ if test "$have_fts" = "false"; then ++ AC_MSG_ERROR("no libfts found") ++ else ++ fts_LDADD="-lfts" ++ fi ++else ++ fts_LDADD="" ++fi ++AC_SUBST([fts_LDADD]) ++ ++dnl Check if we have obstack available from our libc ++AC_LINK_IFELSE( ++ [AC_LANG_PROGRAM( ++ [#include <obstack.h>], ++ [_obstack_begin(0, 0, 0, NULL, NULL); return 0;] ++ )], ++ [libc_has_obstack="true"], ++ [libc_has_obstack="false"] ++) ++ ++dnl If our libc doesn't provide obstack, then test for libobstack ++if test "$libc_has_obstack" = "false" ; then ++ AC_MSG_WARN("libc does not have obstack") ++ AC_CHECK_LIB([obstack], [_obstack_begin], [have_obstack="true"], [have_obstack="false"]) ++ ++ if test "$have_obstack" = "false"; then ++ AC_MSG_ERROR("no libobstack found") ++ else ++ obstack_LDADD="-lobstack" ++ fi ++else ++ obstack_LDADD="" ++fi ++AC_SUBST([obstack_LDADD]) ++ + dnl The directories with content. + + dnl Documentation. +diff -Naur elfutils-0.170.orig/libdw/Makefile.am elfutils-0.170/libdw/Makefile.am +--- elfutils-0.170.orig/libdw/Makefile.am 2017-08-08 12:51:02.725540814 -0700 ++++ elfutils-0.170/libdw/Makefile.am 2017-08-08 13:01:23.933848087 -0700 +@@ -105,7 +105,7 @@ + libdw_so_LIBS = libdw_pic.a ../libdwelf/libdwelf_pic.a \ + ../libdwfl/libdwfl_pic.a ../libebl/libebl.a + libdw_so_DEPS = ../lib/libeu.a ../libelf/libelf.so +-libdw_so_LDLIBS = $(libdw_so_DEPS) -ldl -lz $(argp_LDADD) $(zip_LIBS) ++libdw_so_LDLIBS = $(libdw_so_DEPS) -ldl -lz $(argp_LDADD) $(fts_LDADD) $(zip_LIBS) + libdw_so_SOURCES = + libdw.so$(EXEEXT): $(srcdir)/libdw.map $(libdw_so_LIBS) $(libdw_so_DEPS) + # The rpath is necessary for libebl because its $ORIGIN use will +diff -Naur elfutils-0.170.orig/src/Makefile.am elfutils-0.170/src/Makefile.am +--- elfutils-0.170.orig/src/Makefile.am 2017-08-08 12:51:02.768541249 -0700 ++++ elfutils-0.170/src/Makefile.am 2017-08-08 13:02:47.304579123 -0700 +@@ -68,8 +68,8 @@ + unstrip_no_Wstack_usage = yes + + readelf_LDADD = $(libdw) $(libebl) $(libelf) $(libeu) $(argp_LDADD) -ldl +-nm_LDADD = $(libdw) $(libebl) $(libelf) $(libeu) $(argp_LDADD) -ldl \ +- $(demanglelib) ++nm_LDADD = $(libdw) $(libebl) $(libelf) $(libeu) $(argp_LDADD) \ ++ $(obstack_LDADD) -ldl $(demanglelib) + size_LDADD = $(libelf) $(libeu) $(argp_LDADD) + strip_LDADD = $(libebl) $(libelf) $(libdw) $(libeu) $(argp_LDADD) -ldl + elflint_LDADD = $(libebl) $(libelf) $(libeu) $(argp_LDADD) -ldl +@@ -77,9 +77,9 @@ + addr2line_LDADD = $(libdw) $(libelf) $(libeu) $(argp_LDADD) $(demanglelib) + elfcmp_LDADD = $(libebl) $(libelf) $(libeu) $(argp_LDADD) -ldl + objdump_LDADD = $(libasm) $(libebl) $(libelf) $(libeu) $(argp_LDADD) -ldl +-ranlib_LDADD = libar.a $(libelf) $(libeu) $(argp_LDADD) ++ranlib_LDADD = libar.a $(libelf) $(libeu) $(argp_LDADD) $(obstack_LDADD) + strings_LDADD = $(libelf) $(libeu) $(argp_LDADD) +-ar_LDADD = libar.a $(libelf) $(libeu) $(argp_LDADD) ++ar_LDADD = libar.a $(libelf) $(libeu) $(argp_LDADD) $(obstack_LDADD) + unstrip_LDADD = $(libebl) $(libelf) $(libdw) $(libeu) $(argp_LDADD) -ldl + stack_LDADD = $(libebl) $(libelf) $(libdw) $(libeu) $(argp_LDADD) -ldl $(demanglelib) + elfcompress_LDADD = $(libebl) $(libelf) $(libdw) $(libeu) $(argp_LDADD)
