summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2012-02-28 21:52:39 +0000
committerMike Frysinger <vapier@gentoo.org>2012-02-28 21:52:39 +0000
commit5bb404d4aa237f03523424cda87caebe6bafc74b (patch)
tree3c040876b0e565b1d157b734069ef21af5698f3e /dev-libs
parentClean up ebuild a lot, add USE=static-libs, update to EAPI=4, and fix the DEP... (diff)
downloadgentoo-2-5bb404d4aa237f03523424cda87caebe6bafc74b.tar.gz
gentoo-2-5bb404d4aa237f03523424cda87caebe6bafc74b.tar.bz2
gentoo-2-5bb404d4aa237f03523424cda87caebe6bafc74b.zip
Drop cross-compiling hacks now that upstream has updated things.
(Portage version: 2.2.0_alpha86/cvs/Linux x86_64)
Diffstat (limited to 'dev-libs')
-rw-r--r--dev-libs/elfutils/ChangeLog5
-rw-r--r--dev-libs/elfutils/elfutils-0.153.ebuild42
2 files changed, 8 insertions, 39 deletions
diff --git a/dev-libs/elfutils/ChangeLog b/dev-libs/elfutils/ChangeLog
index d67a4af10221..fae9fe354ae9 100644
--- a/dev-libs/elfutils/ChangeLog
+++ b/dev-libs/elfutils/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for dev-libs/elfutils
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/elfutils/ChangeLog,v 1.158 2012/02/23 22:06:43 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/elfutils/ChangeLog,v 1.159 2012/02/28 21:52:39 vapier Exp $
+
+ 28 Feb 2012; Mike Frysinger <vapier@gentoo.org> elfutils-0.153.ebuild:
+ Drop cross-compiling hacks now that upstream has updated things.
*elfutils-0.153 (23 Feb 2012)
diff --git a/dev-libs/elfutils/elfutils-0.153.ebuild b/dev-libs/elfutils/elfutils-0.153.ebuild
index 8afc1aa93eab..b07b8c35a05c 100644
--- a/dev-libs/elfutils/elfutils-0.153.ebuild
+++ b/dev-libs/elfutils/elfutils-0.153.ebuild
@@ -1,10 +1,10 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/elfutils/elfutils-0.153.ebuild,v 1.1 2012/02/23 22:06:43 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/elfutils/elfutils-0.153.ebuild,v 1.2 2012/02/28 21:52:39 vapier Exp $
EAPI="3"
-inherit eutils toolchain-funcs
+inherit eutils
DESCRIPTION="Libraries/utilities to handle ELF objects (drop in replacement for libelf)"
HOMEPAGE="https://fedorahosted.org/elfutils/"
@@ -36,58 +36,24 @@ src_prepare() {
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"
+ emake -j1 check || die "test failed"
}
src_install() {
- emake -C ${CHOST} DESTDIR="${D}" install || die
+ emake DESTDIR="${D}" install || die
dodoc AUTHORS ChangeLog NEWS NOTES README THANKS TODO
}