diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2004-11-09 02:17:41 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2004-11-09 02:17:41 +0000 |
| commit | 9ad7d07af5feeced37cd1fd5958c7057d51d5102 (patch) | |
| tree | c598e7f12099c7a354d307817708f6b5bfbc7bbc /sys-devel | |
| parent | arm KEYWORDS (diff) | |
| download | gentoo-2-9ad7d07af5feeced37cd1fd5958c7057d51d5102.tar.gz gentoo-2-9ad7d07af5feeced37cd1fd5958c7057d51d5102.tar.bz2 gentoo-2-9ad7d07af5feeced37cd1fd5958c7057d51d5102.zip | |
update patching
Diffstat (limited to 'sys-devel')
| -rw-r--r-- | sys-devel/binutils/binutils-2.15.92.0.2-r1.ebuild | 8 | ||||
| -rw-r--r-- | sys-devel/binutils/binutils-2.15.92.0.2-r2.ebuild | 9 |
2 files changed, 4 insertions, 13 deletions
diff --git a/sys-devel/binutils/binutils-2.15.92.0.2-r1.ebuild b/sys-devel/binutils/binutils-2.15.92.0.2-r1.ebuild index 7518d2b858e2..bc7d604ff395 100644 --- a/sys-devel/binutils/binutils-2.15.92.0.2-r1.ebuild +++ b/sys-devel/binutils/binutils-2.15.92.0.2-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils/binutils-2.15.92.0.2-r1.ebuild,v 1.7 2004/11/07 09:14:33 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils/binutils-2.15.92.0.2-r1.ebuild,v 1.8 2004/11/09 02:17:41 vapier Exp $ inherit eutils libtool flag-o-matic gnuconfig @@ -28,11 +28,7 @@ src_unpack() { cd ${S} mkdir -p ${WORKDIR}/patch/skip - # uclibc uses non-relro version - use uclibc \ - && mv ${WORKDIR}/patch/*relro* ${WORKDIR}/patch/skip/ \ - || mv ${WORKDIR}/patch/*no_rel_ro* ${WORKDIR}/patch/20_* ${WORKDIR}/patch/skip/ - mv ${WORKDIR}/patch/*ldsoconf* ${WORKDIR}/patch/skip/ + mv ${WORKDIR}/patch/*no_rel_ro* ${WORKDIR}/patch/20_* ${WORKDIR}/patch/*ldsoconf* skip/ epatch ${WORKDIR}/patch epatch ${WORKDIR}/uclibc-patches diff --git a/sys-devel/binutils/binutils-2.15.92.0.2-r2.ebuild b/sys-devel/binutils/binutils-2.15.92.0.2-r2.ebuild index f57445b0282b..ca10a7809727 100644 --- a/sys-devel/binutils/binutils-2.15.92.0.2-r2.ebuild +++ b/sys-devel/binutils/binutils-2.15.92.0.2-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils/binutils-2.15.92.0.2-r2.ebuild,v 1.4 2004/11/07 09:14:33 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils/binutils-2.15.92.0.2-r2.ebuild,v 1.5 2004/11/09 02:17:41 vapier Exp $ inherit eutils libtool flag-o-matic gnuconfig @@ -32,12 +32,7 @@ src_unpack() { # Patches cd ${WORKDIR}/patch mkdir skip - if use uclibc ; then - mv *relro* skip/ - else - mv *no_rel_ro* 20_* skip/ - fi - mv *ldsoconf* skip/ + mv *no_rel_ro* 20_* *ldsoconf* skip/ cd ${S} epatch ${WORKDIR}/patch epatch ${WORKDIR}/uclibc-patches |