summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNed Ludd <solar@gentoo.org>2004-08-05 10:22:43 +0000
committerNed Ludd <solar@gentoo.org>2004-08-05 10:22:43 +0000
commit84c4774941d8963c1dd4c8de5018c6538beb5fb9 (patch)
tree68e560dbe6c8c378bc68519040df3edf8bf7d3a6 /sys-apps/diffutils
parentmarked ppc (Manifest recommit) (diff)
downloadgentoo-2-84c4774941d8963c1dd4c8de5018c6538beb5fb9.tar.gz
gentoo-2-84c4774941d8963c1dd4c8de5018c6538beb5fb9.tar.bz2
gentoo-2-84c4774941d8963c1dd4c8de5018c6538beb5fb9.zip
This build defines --build= to the CHOST which breaks when your trying to cross compile as CBUILD is already defined
Diffstat (limited to 'sys-apps/diffutils')
-rw-r--r--sys-apps/diffutils/ChangeLog6
-rw-r--r--sys-apps/diffutils/Manifest24
-rw-r--r--sys-apps/diffutils/diffutils-2.8.7.ebuild9
3 files changed, 18 insertions, 21 deletions
diff --git a/sys-apps/diffutils/ChangeLog b/sys-apps/diffutils/ChangeLog
index 6a0acd67eba3..b7152e9e0b5e 100644
--- a/sys-apps/diffutils/ChangeLog
+++ b/sys-apps/diffutils/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sys-apps/diffutils
# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/diffutils/ChangeLog,v 1.35 2004/06/25 20:41:21 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/diffutils/ChangeLog,v 1.36 2004/08/05 10:22:43 solar Exp $
+
+ 05 Aug 2004; <solar@gentoo.org> diffutils-2.8.7.ebuild:
+ This build defines --build= to the CHOST which breaks when your trying to
+ cross compile and CBUILD is already defined
25 Jun 2004; Aron Griffis <agriffis@gentoo.org> diffutils-2.8.4-r3.ebuild:
QA - fix use invocation
diff --git a/sys-apps/diffutils/Manifest b/sys-apps/diffutils/Manifest
index bbe1ea0f0f0d..c65d34c24e75 100644
--- a/sys-apps/diffutils/Manifest
+++ b/sys-apps/diffutils/Manifest
@@ -1,23 +1,13 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 7431b17b5ea90c160f88351dff754507 ChangeLog 4638
-MD5 3d08962c5b5b169e164cd65804148488 diffutils-2.8.4-r3.ebuild 2000
MD5 ab2aaa53d128a08058aba12a2c1a1f82 diffutils-2.8.4-r4.ebuild 2093
+MD5 7c5176a71d4fa6aa01f335b39cc90663 diffutils-2.8.7.ebuild 1678
+MD5 7431b17b5ea90c160f88351dff754507 ChangeLog 4638
MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
-MD5 94dc8566c9cb8b71862e576bb887f592 diffutils-2.8.7.ebuild 1534
+MD5 3d08962c5b5b169e164cd65804148488 diffutils-2.8.4-r3.ebuild 2000
+MD5 a571ebf3fcef3b033e33a4f013521e13 files/diffutils-2.8.4-tabsize-dumps-core.diff 804
+MD5 28aba2261ffb7634265a612938df28f5 files/digest-diffutils-2.8.7 68
MD5 88eef724512016e5400a58e4057ef235 files/diffutils-2.8.4-Makefile-fix-typeo.patch 1158
MD5 bb27bd30edca169156e905ebe7dab570 files/diffutils-2.8.4-no-manpage.patch 1168
-MD5 fcb3554acdf9074aad98b90af6cb915d files/diffutils-2.8.4-sdiff-no-waitpid.patch 525
-MD5 a571ebf3fcef3b033e33a4f013521e13 files/diffutils-2.8.4-tabsize-dumps-core.diff 804
+MD5 96bfbc8c9d4a828ec67d9d537a52d756 files/diffutils-2.8.7-no-manpage.patch 1231
MD5 7abb095c2c2ecdbd465a1953cb443289 files/digest-diffutils-2.8.4-r3 67
MD5 7abb095c2c2ecdbd465a1953cb443289 files/digest-diffutils-2.8.4-r4 67
-MD5 96bfbc8c9d4a828ec67d9d537a52d756 files/diffutils-2.8.7-no-manpage.patch 1231
-MD5 28aba2261ffb7634265a612938df28f5 files/digest-diffutils-2.8.7 68
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.9.8 (GNU/Linux)
-
-iD8DBQFBCIo6HTu7gpaalycRAr2JAKD5/7Kp52l6ZFrKJNnkyaXkVN4/DwCgiY4a
-AzJvqHhVctZV1COjXwwxDk0=
-=LM8G
------END PGP SIGNATURE-----
+MD5 fcb3554acdf9074aad98b90af6cb915d files/diffutils-2.8.4-sdiff-no-waitpid.patch 525
diff --git a/sys-apps/diffutils/diffutils-2.8.7.ebuild b/sys-apps/diffutils/diffutils-2.8.7.ebuild
index 284cd8295b28..bbae3a19c4c7 100644
--- a/sys-apps/diffutils/diffutils-2.8.7.ebuild
+++ b/sys-apps/diffutils/diffutils-2.8.7.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-apps/diffutils/diffutils-2.8.7.ebuild,v 1.7 2004/07/28 04:17:33 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/diffutils/diffutils-2.8.7.ebuild,v 1.8 2004/08/05 10:22:43 solar Exp $
inherit eutils flag-o-matic gnuconfig
@@ -11,7 +11,7 @@ SRC_URI="ftp://alpha.gnu.org/gnu/diffutils/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="-* ~x86 ppc ~hppa amd64 ~ppc64"
-IUSE="nls build static"
+IUSE="nls build static cross"
DEPEND="virtual/libc
>=sys-apps/portage-2.0.47-r10
@@ -42,7 +42,10 @@ src_unpack() {
}
src_compile() {
- econf --build=${CHOST} `use_enable nls` || die "econf"
+ # this conflict's with cross compiling as CBUILD would of
+ # already been defined to the CCHOST. -solar
+ use cross || myconf="--build=${CHOST}"
+ econf ${myconf} `use_enable nls` || die "econf"
if use static ; then
emake LDFLAGS=-static || die