diff options
Diffstat (limited to 'dev-libs/elfutils')
-rw-r--r-- | dev-libs/elfutils/Manifest | 7 | ||||
-rw-r--r-- | dev-libs/elfutils/elfutils-0.179.ebuild | 3 | ||||
-rw-r--r-- | dev-libs/elfutils/elfutils-0.180.ebuild | 86 | ||||
-rw-r--r-- | dev-libs/elfutils/files/elfutils-0.179-CC-in-tests.patch | 45 | ||||
-rw-r--r-- | dev-libs/elfutils/files/elfutils-0.180-PaX-support.patch | 26 | ||||
-rw-r--r-- | dev-libs/elfutils/files/elfutils-0.180-readelf.patch | 23 |
6 files changed, 189 insertions, 1 deletions
diff --git a/dev-libs/elfutils/Manifest b/dev-libs/elfutils/Manifest index f52d3474ca3a..077396917b91 100644 --- a/dev-libs/elfutils/Manifest +++ b/dev-libs/elfutils/Manifest @@ -1,9 +1,14 @@ AUX elfutils-0.118-PaX-support.patch 962 BLAKE2B f631b1dcf20cf257efd83f24cf53b3324f57a5db8a13b8d618c75239d339f01c0f0a13bc87c1988e9ff05e92bfd69b0bbce0f5260a3bbb9d38b9d000ac809818 SHA512 ce542011f6ea4398455e418a8eae06508407e975e179306ffca5e3e9702583ff9f5e6010ee2e25d098b7f396c361029c932cd0c40ba3d910d9fb60c97f07f50c AUX elfutils-0.175-disable-biarch-test-PR24158.patch 307 BLAKE2B 9cfcd2c9ef972b16fdf6bc203ed2cde70b0da80d982dc3493c993532492cdb8f597b66fd38ebedf7517403096c1704d77f7541972d875af2b952cad3586751bb SHA512 d3263c42b1638a416e95c2b8e68b15a9723e748490c8eca727da94bf7bb3dd8389222dd01bf69612ba45a20114ee1427d77935c41436d1ca9180fcfd71d3cdfe AUX elfutils-0.177-disable-large.patch 383 BLAKE2B ce5a90495ca0eac5a74d7e3f52b9f55e0611fe83782374d5201b984e85e7c27897d0d056f53af40ebb383e8cbe315a57adce2af378348ee1a573cfeb005e7a43 SHA512 2660ee456b62d6b1ed72ede92d8b00e9d1cd4b0a5778a80bfbdc3139e5527758591cdb05110b39a5c5811f60e2223cc8c83a488ac055a554f5b3c71fc5980acb +AUX elfutils-0.179-CC-in-tests.patch 1506 BLAKE2B d2eb6acae1af4d4f370e8653ea65a8ae834bfc531c8cf77d3571e940b29ce08be45e93ff565b69eb43a913ace3e6537bba3358ae32ffa81d727d5b94f9ab371d SHA512 bf1a91219006813a5b8d63cc8735b0956187c097cbdae015a984a6c9fe11343d45315a8df779aad37b7c71c403f13351ebd9a08de06243437cffd8903c5aa7a7 AUX elfutils-0.179-PaX-support.patch 1071 BLAKE2B 5b47db44011092b6fc9cfef342b87bea02c78ee247a1acfca69e0414a741875ba87a6fba3d370cb20541f9d8950552b31ea6a6e9736c6b5da285d45a2bc81d1d SHA512 9d21b955532fe5261fb314283d723f04ff4a04cdd31598bbc1904f9c7e833b8d62cd19b1560882c66900c9adeb24ec1b6a173de94ac1fcbce25b67c8db8006a2 +AUX elfutils-0.180-PaX-support.patch 1058 BLAKE2B 9d7980eedf6250b848923eddb86d918ac983b348f77b3816ba77e1a663cc637ec02670e062b005aa010fa50f45fb953b1f2ef033bca6381773793231eb3cef06 SHA512 1bfb390ff4fb9ba2cbaf677bb4cd0d3ab3a27e465629be0dcc7b37f14dfe6c876069b598e29e9f3aa0c345b08c62895e68ce557237d18239c7505b8ea51c9ebd +AUX elfutils-0.180-readelf.patch 1210 BLAKE2B 68003ea8ad853f5c548c2e3f2005f5b258e5bfa52710522afa79fbfec9c45c3d91bc2089b002c3799f92a0ef7748ff2a2cee5c1886c838da89ffabd3b9246b02 SHA512 cac478c4b1e258830fc33b6c9c5cf265bf216026f5cd2d74ba2f331db76f8bdad93aa3b3dba1a0a57263d06c87a839376a59c5519359d781a6de0cc418ef1f0c DIST elfutils-0.177.tar.bz2 8852413 BLAKE2B 03f432342651f7646d73b7847325bd14b722ce34d85df01b1ad072b916af9b9da2d0d119cd24e952073bd584ec76b027ba9b6c7d45fb057372b3e700b1f5741a SHA512 2779987463a22ed220759e25a09c9a1eb84c0f36db37675136e59aa55c7f8f90b7a7d34ffc4e6a4291d7fa73692a1bd1a303a74270b11d1623b4f9868d19498f DIST elfutils-0.179.tar.bz2 9057637 BLAKE2B b34f5af6d2a6613622f4d5da78b9ae10e60800fc91cb4607115fcaaf90c1c544460fb02e164f87e52951a446d6479909bbf3aa02b7db78b26af7863290de8848 SHA512 ff2d96ad1db08e3a2ddaa60bd5a05e9b61ffa71d646f889cebb6bef51322e874930809c6dd0a257ced8c6e8de4b59ecf13ca6741dc68f9400293208278a0c052 +DIST elfutils-0.180.tar.bz2 9079640 BLAKE2B bd7863b82a71d2932a23c9d125d5eb6485977a3256a8a0b25980183d33f7345c3d9fae78277de5c955eb0ceeb955f8fa71d209f4f39bcf6dd49e46a8bbd7efcf SHA512 62e96035ccfe8928baca2285decbe8b8703a2daa956df81ece18fecf643272fb68955806b3e807a514141a7a9bf44520bf09461672aa580bd6807485fb604d25 EBUILD elfutils-0.177.ebuild 2156 BLAKE2B d2455d04f65331456093f5a43b9e1ec06c0ae2ee2ec8073e6db3a1451aa1e6a3ed43834c181fbc7c742d77638ea3746d9f260e8d3ba0924f2f1edc56b05c6b42 SHA512 01011fc1c148a173ad401ecb0d067e9f051d0a37e9c1bc965f7bc6b7d07ca5b69b811ddb7af613e2e95eed768adbca4ff9e16ffaf48bf513017898cb79985fe6 -EBUILD elfutils-0.179.ebuild 2260 BLAKE2B 7b0aa48cbeb4b9e43e0bf2ee7cd76a37d29aa53357dee65b2c624b4b9cec7e0f0d100983d86dabefd40d93fddcd41ce95cac50d4b2cb48e19f48b28e691fa074 SHA512 85de3ad4e18559cca582a05388e090cdab83cf4937b7123de59c4c4fc0271b2a0799a073992aca72bd9d511f864afe510c72bf83f2545e4e1374b9f0ed428af2 +EBUILD elfutils-0.179.ebuild 2374 BLAKE2B 828ea4eb3f9f1890845e27b2fec330454945b23c012350ff316ff7dc75874a33f487c46c74ac44c0ea0fe627a002f0f84cf1d32782ecb4b6fe6520619c5da2b1 SHA512 18554ca09a02faa2327256586cfec79f293ef766d0a5826ab80b05a4bbf5bf193ded1faf418a6ee923e16de0b32f0132ec8c91d94cdb2e8e2e7c7dc4d59b3ca0 +EBUILD elfutils-0.180.ebuild 2415 BLAKE2B 36ffa0112e7a94ee612414a107de9e762b800679da8ca854f3e44ce209dcb43349de6745fdda643bcc78f6b4ff89a9db5d91f439653fd7cb52621a25cf575f41 SHA512 bdda45f1343a8f0bc5cb382177347796522f45bdd60fe4f3c97d3e2d44eb8d38d6f2fd176c32b503d4175f6e63c37a514b355bc454f51d385bc5f845d0b6fbe3 MISC metadata.xml 729 BLAKE2B 7fb60c690ef99ef62b4cd4fbed802a48141b90e295f84fdad09cf18d061dd94a63086be119d733249b91fca67a1588bcea9ee442e3dd142921cb9c163d65a726 SHA512 2e5c223aad3d51f6ae770ae7feacd3731821c9de0b68f6ad2d89a4c7c8360ba6decbd6d73416648186f19d19b4aa6516302cba6554c9f4955024a19c082d0f85 diff --git a/dev-libs/elfutils/elfutils-0.179.ebuild b/dev-libs/elfutils/elfutils-0.179.ebuild index 5313453d1a02..70c6f757d6a7 100644 --- a/dev-libs/elfutils/elfutils-0.179.ebuild +++ b/dev-libs/elfutils/elfutils-0.179.ebuild @@ -31,6 +31,7 @@ PATCHES=( "${FILESDIR}"/${PN}-0.175-disable-biarch-test-PR24158.patch "${FILESDIR}"/${PN}-0.177-disable-large.patch "${FILESDIR}"/${PN}-0.179-PaX-support.patch + "${FILESDIR}"/${PN}-0.179-CC-in-tests.patch ) src_prepare() { @@ -66,8 +67,10 @@ multilib_src_configure() { } multilib_src_test() { + # CC is a workaround for tests using ${CC-gcc} env LD_LIBRARY_PATH="${BUILD_DIR}/libelf:${BUILD_DIR}/libebl:${BUILD_DIR}/libdw:${BUILD_DIR}/libasm" \ LC_ALL="C" \ + CC="$(gc-getCC)" \ emake check VERBOSE=1 } diff --git a/dev-libs/elfutils/elfutils-0.180.ebuild b/dev-libs/elfutils/elfutils-0.180.ebuild new file mode 100644 index 000000000000..086304510f1c --- /dev/null +++ b/dev-libs/elfutils/elfutils-0.180.ebuild @@ -0,0 +1,86 @@ +# Copyright 2003-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit flag-o-matic multilib-minimal + +DESCRIPTION="Libraries/utilities to handle ELF objects (drop in replacement for libelf)" +HOMEPAGE="http://elfutils.org/" +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 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" +IUSE="bzip2 lzma nls static-libs test +threads +utils valgrind" + +RDEPEND=">=sys-libs/zlib-1.2.8-r1[static-libs?,${MULTILIB_USEDEP}] + bzip2? ( >=app-arch/bzip2-1.0.6-r4[static-libs?,${MULTILIB_USEDEP}] ) + lzma? ( >=app-arch/xz-utils-5.0.5-r1[static-libs?,${MULTILIB_USEDEP}] ) + !dev-libs/libelf" +DEPEND="${RDEPEND} + valgrind? ( dev-util/valgrind ) +" +BDEPEND="nls? ( sys-devel/gettext ) + >=sys-devel/flex-2.5.4a + sys-devel/m4" + +RESTRICT="!test? ( test )" + +PATCHES=( + "${FILESDIR}"/${PN}-0.175-disable-biarch-test-PR24158.patch + "${FILESDIR}"/${PN}-0.177-disable-large.patch + "${FILESDIR}"/${PN}-0.180-PaX-support.patch + "${FILESDIR}"/${PN}-0.179-CC-in-tests.patch + "${FILESDIR}"/${PN}-0.180-readelf.patch +) + +src_prepare() { + default + + if ! use static-libs; then + sed -i -e '/^lib_LIBRARIES/s:=.*:=:' -e '/^%.os/s:%.o$::' lib{asm,dw,elf}/Makefile.in || die + fi + # https://sourceware.org/PR23914 + sed -i 's:-Werror::' */Makefile.in || die +} + +src_configure() { + use test && append-flags -g #407135 + + # Symbol aliases are implemented as asm statements. + # Will require porting: https://gcc.gnu.org/PR48200 + filter-flags '-flto*' + + multilib-minimal_src_configure +} + +multilib_src_configure() { + ECONF_SOURCE="${S}" econf \ + $(use_enable nls) \ + $(use_enable threads thread-safety) \ + $(use_enable valgrind) \ + --disable-debuginfod \ + --program-prefix="eu-" \ + --with-zlib \ + $(use_with bzip2 bzlib) \ + $(use_with lzma) +} + +multilib_src_test() { + # CC is a workaround for tests using ${CC-gcc} + env LD_LIBRARY_PATH="${BUILD_DIR}/libelf:${BUILD_DIR}/libebl:${BUILD_DIR}/libdw:${BUILD_DIR}/libasm" \ + LC_ALL="C" \ + CC="$(gc-getCC)" \ + emake check VERBOSE=1 +} + +multilib_src_install_all() { + einstalldocs + dodoc NOTES + # These build quick, and are needed for most tests, so don't + # disable their building when the USE flag is disabled. + if ! use utils; then + rm -rf "${ED}"/usr/bin || die + fi +} diff --git a/dev-libs/elfutils/files/elfutils-0.179-CC-in-tests.patch b/dev-libs/elfutils/files/elfutils-0.179-CC-in-tests.patch new file mode 100644 index 000000000000..aa58862ec895 --- /dev/null +++ b/dev-libs/elfutils/files/elfutils-0.179-CC-in-tests.patch @@ -0,0 +1,45 @@ +https://bugs.gentoo.org/718872 +--- a/tests/run-disasm-x86-64.sh ++++ b/tests/run-disasm-x86-64.sh +@@ -22,7 +22,7 @@ case "`uname -m`" in + x86_64) + tempfiles testfile45.o + testfiles testfile45.S testfile45.expect +- gcc -m64 -c -o testfile45.o testfile45.S ++ ${CC-gcc} -m64 -c -o testfile45.o testfile45.S + testrun_compare ${abs_top_builddir}/src/objdump -d testfile45.o < testfile45.expect + ;; + esac +--- a/tests/run-disasm-x86.sh ++++ b/tests/run-disasm-x86.sh +@@ -22,7 +22,7 @@ case "`uname -m`" in + x86_64 | i?86 ) + tempfiles testfile44.o + testfiles testfile44.S testfile44.expect +- gcc -m32 -c -o testfile44.o testfile44.S ++ ${CC-gcc} -m32 -c -o testfile44.o testfile44.S + testrun_compare ${abs_top_builddir}/src/objdump -d testfile44.o < testfile44.expect + ;; + esac +--- a/tests/run-strip-g.sh ++++ b/tests/run-strip-g.sh +@@ -25,7 +25,7 @@ + tempfiles a.out strip.out debug.out readelf.out + + echo Create debug a.out. +-echo "int main() { return 1; }" | gcc -g -xc - ++echo "int main() { return 1; }" | ${CC-gcc} -g -xc - + + echo strip -g to file with debug file + testrun ${abs_top_builddir}/src/strip -g -o strip.out -f debug.out || +--- a/tests/run-strip-nothing.sh ++++ b/tests/run-strip-nothing.sh +@@ -23,7 +23,7 @@ + tempfiles a.out strip.out debug.out + + # Create no-debug a.out. +-echo "int main() { return 1; }" | gcc -s -xc - ++echo "int main() { return 1; }" | ${CC-gcc} -s -xc - + + # strip to file + testrun ${abs_top_builddir}/src/strip -g -o strip.out || diff --git a/dev-libs/elfutils/files/elfutils-0.180-PaX-support.patch b/dev-libs/elfutils/files/elfutils-0.180-PaX-support.patch new file mode 100644 index 000000000000..2d44c757711a --- /dev/null +++ b/dev-libs/elfutils/files/elfutils-0.180-PaX-support.patch @@ -0,0 +1,26 @@ +Add support for PaX ELF markings + +Patch by Kevin F. Quinn <kevquinn@gentoo.org> + +http://bugs.gentoo.org/115100 + +--- a/libelf/elf.h ++++ b/libelf/elf.h +@@ -722,6 +722,7 @@ typedef struct + #define PT_GNU_STACK 0x6474e551 /* Indicates stack executability */ + #define PT_GNU_RELRO 0x6474e552 /* Read-only after relocation */ + #define PT_GNU_PROPERTY 0x6474e553 /* GNU property */ ++#define PT_PAX_FLAGS 0x65041580 /* Indicates PaX flag markings */ + #define PT_LOSUNW 0x6ffffffa + #define PT_SUNWBSS 0x6ffffffa /* Sun Specific segment */ + #define PT_SUNWSTACK 0x6ffffffb /* Stack segment */ +--- a/src/elflint.c ++++ b/src/elflint.c +@@ -4493,6 +4493,7 @@ only executables, shared objects, and core files can have program headers\n")); + + if (phdr->p_type >= PT_NUM && phdr->p_type != PT_GNU_EH_FRAME + && phdr->p_type != PT_GNU_STACK && phdr->p_type != PT_GNU_RELRO ++ && phdr->p_type != PT_PAX_FLAGS + && phdr->p_type != PT_GNU_PROPERTY + /* Check for a known machine-specific type. */ + && ebl_segment_type_name (ebl, phdr->p_type, NULL, 0) == NULL) diff --git a/dev-libs/elfutils/files/elfutils-0.180-readelf.patch b/dev-libs/elfutils/files/elfutils-0.180-readelf.patch new file mode 100644 index 000000000000..a347d03041dc --- /dev/null +++ b/dev-libs/elfutils/files/elfutils-0.180-readelf.patch @@ -0,0 +1,23 @@ +Use tool-prefixed readelf. +--- a/configure.ac ++++ b/configure.ac +@@ -200,7 +200,7 @@ fi + # We really want build-ids. Warn and force generating them if gcc was + # configure without --enable-linker-build-id + AC_CACHE_CHECK([whether the compiler generates build-ids], ac_cv_buildid, [dnl +-AC_LINK_IFELSE([AC_LANG_PROGRAM()],[ac_cv_buildid=yes; readelf -n conftest$EXEEXT | grep -q NT_GNU_BUILD_ID || ac_cv_buildid=no],AC_MSG_FAILURE([unexpected compile failure]))]) ++AC_LINK_IFELSE([AC_LANG_PROGRAM()],[ac_cv_buildid=yes; $READELF -n conftest$EXEEXT | grep -q NT_GNU_BUILD_ID || ac_cv_buildid=no],AC_MSG_FAILURE([unexpected compile failure]))]) + if test "$ac_cv_buildid" = "no"; then + AC_MSG_WARN([compiler doesn't generate build-id by default]) + LDFLAGS="$LDFLAGS -Wl,--build-id" +--- a/configure ++++ b/configure +@@ -5343,7 +5343,7 @@ main () + } + _ACEOF + if ac_fn_c_try_link "$LINENO"; then : +- ac_cv_buildid=yes; readelf -n conftest$EXEEXT | grep -q NT_GNU_BUILD_ID || ac_cv_buildid=no ++ ac_cv_buildid=yes; $READELF -n conftest$EXEEXT | grep -q NT_GNU_BUILD_ID || ac_cv_buildid=no + else + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 + $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} |