summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiego Elio Pettenò <flameeyes@gentoo.org>2008-10-15 22:13:57 +0000
committerDiego Elio Pettenò <flameeyes@gentoo.org>2008-10-15 22:13:57 +0000
commitdaeedb93b3b4be8f8951b72b2bc10cc36df781b0 (patch)
tree917239d330ce7b1c33af058f8a3c928e7eb3a482 /app-arch/macutil
parentStable on sparc (diff)
downloadhistorical-daeedb93b3b4be8f8951b72b2bc10cc36df781b0.tar.gz
historical-daeedb93b3b4be8f8951b72b2bc10cc36df781b0.tar.bz2
historical-daeedb93b3b4be8f8951b72b2bc10cc36df781b0.zip
Respect CFLAGS and LDFLAGS at make. Also respect CC. Closes bug #239926.
Package-Manager: portage-2.2_rc12/cvs/Linux 2.6.27-gentoo x86_64
Diffstat (limited to 'app-arch/macutil')
-rw-r--r--app-arch/macutil/ChangeLog6
-rw-r--r--app-arch/macutil/Manifest10
-rw-r--r--app-arch/macutil/macutil-2.0_beta3.ebuild14
3 files changed, 19 insertions, 11 deletions
diff --git a/app-arch/macutil/ChangeLog b/app-arch/macutil/ChangeLog
index 0e07292a0857..42e00e4983bf 100644
--- a/app-arch/macutil/ChangeLog
+++ b/app-arch/macutil/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-arch/macutil
# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/macutil/ChangeLog,v 1.16 2008/08/23 18:15:44 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/macutil/ChangeLog,v 1.17 2008/10/15 22:13:57 flameeyes Exp $
+
+ 15 Oct 2008; Diego Pettenò <flameeyes@gentoo.org>
+ macutil-2.0_beta3.ebuild:
+ Respect CFLAGS and LDFLAGS at make. Also respect CC. Closes bug #239926.
23 Aug 2008; Markus Meier <maekke@gentoo.org> macutil-2.0_beta3.ebuild:
add ~amd64, bug #225985
diff --git a/app-arch/macutil/Manifest b/app-arch/macutil/Manifest
index 39e276b3c644..ff84fdd71205 100644
--- a/app-arch/macutil/Manifest
+++ b/app-arch/macutil/Manifest
@@ -4,13 +4,13 @@ Hash: SHA1
AUX 2.0_beta3-gentoo.patch 523 RMD160 8e63a9620c0c48ca67465abb96f1c05c7155032c SHA1 297a2cb24af086ea9d2f7388ee7fb554e63dc7eb SHA256 34f3f29f73f6ab67559a58c45ac98c59bfec6fe3e471628a9019686807c90843
AUX macutil-2.0_beta3-gcc4.patch 394 RMD160 1b3c6abe9cc8c4cfc2c0b863a37a62302f498643 SHA1 2f9780b2ce71d69522673a6b5d90f3ec7090c6fc SHA256 efbe910a15fe0d85b085f13fd8543f1452cb40277927205139f3e5d7550dce5f
DIST macutil2.0b3.shar.Z 167565 RMD160 5cf3b22d8bdd3a8fa61211e7a0d598ebac9bbfe4 SHA1 820e4dd278fe8d043306134aaafccab10b832218 SHA256 e31e4c11a711d8fa5bfadd3ceacb11dfa48c45758325d9302f271941d8a74d28
-EBUILD macutil-2.0_beta3.ebuild 1054 RMD160 af186897b2b3611b32da140918b7a4e25fee0932 SHA1 344b90bd5de4b8a23038efd2d5523d70e7398145 SHA256 ce400c478148ffaafc6f18c317fd70df777c76a51563a9efb0fc0182d0c364f6
-MISC ChangeLog 2043 RMD160 cf1c2d3fbb7a6767e48d4f7acf0e916e100d99b6 SHA1 1f4c774821a31134cc106cd117669dbf61388639 SHA256 02d406b7c8eaf2a25589692b92bad01b167056d29e27e2c7a043387a0c5299f5
+EBUILD macutil-2.0_beta3.ebuild 1196 RMD160 3c59654025a01200db79d6cba2c281ab3257e5f7 SHA1 362d59a0d7f8a2dbc77b9a3468db590ec39a33b2 SHA256 67a14f50c105c23291b9a168a680924afceb5e4679ae81e6ab22218326e20adc
+MISC ChangeLog 2203 RMD160 c5230e44a8a006b0eaa6d14da46e265ec5d7ce83 SHA1 7d1ebdb4f26270e4507361c5279d2bbd9b2b2508 SHA256 4262139bdab54614e6919f859e2e986d6d5bfd5a4ac1da0b926bad64c795e313
MISC metadata.xml 314 RMD160 25181cde297628576a9545bea3a76601485bfaf3 SHA1 ac16b621acf5a22b64859e3323d466fb556fc4c8 SHA256 736baab77aea9c4da199c01e3cd6877c271bd02357ff9b41b537a2232c6e96d7
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.9 (GNU/Linux)
-iEYEARECAAYFAkiwVCEACgkQkKaRLQcq0GLoHQCdHfLPLyI8RbOyd5STTlQICcM9
-5aYAn3MqAdspTy2PVEWuot0aMkYzoeuu
-=wK7g
+iEYEARECAAYFAkj2aywACgkQAiZjviIA2XgoJACdEIUNotDjN3oP4KYGKY1ezFoF
+XVcAn2+eTiP8xfYMUIa5RRvFtjytZ4KQ
+=479/
-----END PGP SIGNATURE-----
diff --git a/app-arch/macutil/macutil-2.0_beta3.ebuild b/app-arch/macutil/macutil-2.0_beta3.ebuild
index ec82456aaa45..80b02cd90959 100644
--- a/app-arch/macutil/macutil-2.0_beta3.ebuild
+++ b/app-arch/macutil/macutil-2.0_beta3.ebuild
@@ -1,8 +1,8 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/macutil/macutil-2.0_beta3.ebuild,v 1.15 2008/08/23 18:15:44 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/macutil/macutil-2.0_beta3.ebuild,v 1.16 2008/10/15 22:13:57 flameeyes Exp $
-inherit eutils
+inherit eutils toolchain-funcs
MY_P=${P/_beta/b}
DESCRIPTION="A collection of programs to handle Macintosh files/archives on non-Macintosh systems"
@@ -25,15 +25,19 @@ src_unpack() {
cd ${PN}
sed -i.orig \
- -e "s:CF =\t\(.*\):CF = \1 ${CFLAGS}:g" \
-e "s:-DBSD::g" \
-e "s:-DDEBUG::g" \
-e "s:/ufs/dik/tmpbin:${D}/usr/bin:g" \
- makefile
+ makefile || die "sed makefile failed"
+
+ sed -i \
+ -e '/^CFLAGS =/s:= -O:+=:' \
+ -e '/(OBJ/s:CFLAGS:LDFLAGS:' \
+ */makefile || die "sed makefile [2] failed"
}
src_compile() {
- emake || die "build failed"
+ emake CC="$(tc-getCC)" || die "build failed"
}
src_install() {