From 820bc66af05e28708d712c7fdfee3c52521f6439 Mon Sep 17 00:00:00 2001 From: Geoff Pike Date: Thu, 17 Nov 2011 18:04:10 -0800 Subject: [PATCH] Upgraded the elfutils Portage package Upgraded dev-libs/elfutils to version 0.152-r1 on arm, x86. This is step 1. Step 2 will be to enable 0.152-r1 for arm, amd64, and x86, in chromiumos-overlay/profiles/default/linux/package.keywords. BUG=chromium-os:21223 TEST=built x86-alex and arm-generic Change-Id: Ia26608ff8ec49029a667f9c0fca21784a4219b50 Reviewed-on: https://gerrit.chromium.org/gerrit/11948 Reviewed-by: Mike Frysinger Commit-Ready: Geoff Pike Tested-by: Geoff Pike --- .../elfutils/elfutils-0.152-r1.ebuild | 93 +++++++++++++++++++ .../files/elfutils-0.118-PaX-support.patch | 26 ++++++ 2 files changed, 119 insertions(+) create mode 100644 sdk_container/src/third_party/portage-stable/dev-libs/elfutils/elfutils-0.152-r1.ebuild create mode 100644 sdk_container/src/third_party/portage-stable/dev-libs/elfutils/files/elfutils-0.118-PaX-support.patch diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/elfutils/elfutils-0.152-r1.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/elfutils/elfutils-0.152-r1.ebuild new file mode 100644 index 0000000000..0a03d4d001 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-libs/elfutils/elfutils-0.152-r1.ebuild @@ -0,0 +1,93 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-libs/elfutils/elfutils-0.152-r1.ebuild,v 1.4 2011/10/31 22:23:02 vapier Exp $ + +EAPI="3" + +inherit eutils toolchain-funcs + +DESCRIPTION="Libraries/utilities to handle ELF objects (drop in replacement for libelf)" +HOMEPAGE="https://fedorahosted.org/elfutils/" +SRC_URI="https://fedorahosted.org/releases/e/l/${PN}/${PV}/${P}.tar.bz2 + https://fedorahosted.org/releases/e/l/${PN}/${PV}/${PN}-portability.patch -> ${P}-portability.patch + https://fedorahosted.org/releases/e/l/${PN}/${PV}/${PN}-robustify.patch -> ${P}-robustify.patch" + +LICENSE="GPL-2-with-exceptions" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux" +IUSE="bzip2 lzma nls zlib" + +# This pkg does not actually seem to compile currently in a uClibc +# environment (xrealloc errs), but we need to ensure that glibc never +# gets pulled in as a dep since this package does not respect virtual/libc +RDEPEND="zlib? ( >=sys-libs/zlib-1.2.2.3 ) + bzip2? ( app-arch/bzip2 ) + lzma? ( app-arch/xz-utils ) + !dev-libs/libelf" +DEPEND="${RDEPEND} + nls? ( sys-devel/gettext ) + >=sys-devel/flex-2.5.4a + sys-devel/m4" + +src_prepare() { + 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 + # some patches touch both configure and configure.ac + find -type f -exec touch -r configure {} + + mkdir -p ${CBUILD} ${CHOST} +} + +econf_build() { + CFLAGS=${BUILD_CFLAGS:--O1 -pipe} \ + CXXFLAGS=${BUILD_CXXFLAGS:--O1 -pipe} \ + CPPFLAGS=${BUILD_CPPFLAGS} \ + LDFLAGS=${BUILD_LDFLAGS} \ + CC=$(tc-getBUILD_CC) \ + LD=$(tc-getBUILD_LD) \ + econf --host=${CBUILD} "$@" +} + +src_configure() { + ECONF_SOURCE=${S} + + if tc-is-cross-compiler ; then + pushd ${CBUILD} >/dev/null + econf_build --disable-nls --without-{zlib,bzlib,lzma} + popd >/dev/null + fi + + pushd ${CHOST} >/dev/null + econf \ + $(use_enable nls) \ + --program-prefix="eu-" \ + $(use_with zlib) \ + $(use_with bzip2 bzlib) \ + $(use_with lzma) + popd >/dev/null +} + +src_compile() { + if tc-is-cross-compiler ; then + pushd ${CBUILD} >/dev/null + emake -C lib || die + emake -C libcpu || die + popd >/dev/null + ln ${CBUILD}/libcpu/i386_gendis ${CHOST}/libcpu/ || die + sed -i -e '/^%_dis.h: %_defs/s: i386_gendis::' ${CHOST}/libcpu/Makefile || die + fi + + emake -C ${CHOST} || die +} + +src_test() { + env LD_LIBRARY_PATH="${S}/libelf:${S}/libebl:${S}/libdw:${S}/libasm" \ + LC_ALL="C" \ + emake -C ${CHOST} -j1 check || die "test failed" +} + +src_install() { + emake -C ${CHOST} DESTDIR="${D}" install || die + dodoc AUTHORS ChangeLog NEWS NOTES README THANKS TODO +} diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/elfutils/files/elfutils-0.118-PaX-support.patch b/sdk_container/src/third_party/portage-stable/dev-libs/elfutils/files/elfutils-0.118-PaX-support.patch new file mode 100644 index 0000000000..083f32ff85 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-libs/elfutils/files/elfutils-0.118-PaX-support.patch @@ -0,0 +1,26 @@ +Add support for PaX ELF markings + +Patch by Kevin F. Quinn + +http://bugs.gentoo.org/115100 + +--- libelf/elf.h ++++ libelf/elf.h +@@ -568,6 +568,7 @@ + #define PT_GNU_EH_FRAME 0x6474e550 /* GCC .eh_frame_hdr segment */ + #define PT_GNU_STACK 0x6474e551 /* Indicates stack executability */ + #define PT_GNU_RELRO 0x6474e552 /* Read-only after relocation */ ++#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 */ +--- src/elflint.c ++++ src/elflint.c +@@ -3187,6 +3187,7 @@ + + 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 + /* Check for a known machine-specific type. */ + && ebl_segment_type_name (ebl, phdr->p_type, NULL, 0) == NULL) + ERROR (gettext ("\