summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNed Ludd <solar@gentoo.org>2008-09-21 07:16:19 +0000
committerNed Ludd <solar@gentoo.org>2008-09-21 07:16:19 +0000
commit11f1144e56430c0202c1bcd2011021e0bc3ae5c5 (patch)
tree6dc5d9280154be7e76862a637ff8fb2019aa18d7 /media-gfx
parentAvoid running dodoc on dirs #234096 by Doug Goldstein. (diff)
downloadhistorical-11f1144e56430c0202c1bcd2011021e0bc3ae5c5.tar.gz
historical-11f1144e56430c0202c1bcd2011021e0bc3ae5c5.tar.bz2
historical-11f1144e56430c0202c1bcd2011021e0bc3ae5c5.zip
- Make cross compile aware. Avoid calls to built_with_use when doing x-compiles
Package-Manager: portage-2.1.4.4
Diffstat (limited to 'media-gfx')
-rw-r--r--media-gfx/splashutils/ChangeLog5
-rw-r--r--media-gfx/splashutils/Manifest4
-rw-r--r--media-gfx/splashutils/splashutils-1.5.4.2.ebuild11
3 files changed, 12 insertions, 8 deletions
diff --git a/media-gfx/splashutils/ChangeLog b/media-gfx/splashutils/ChangeLog
index d212ef9ad4d3..346b8d048913 100644
--- a/media-gfx/splashutils/ChangeLog
+++ b/media-gfx/splashutils/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for media-gfx/splashutils
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/ChangeLog,v 1.144 2008/09/13 10:23:34 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/ChangeLog,v 1.145 2008/09/21 07:16:19 solar Exp $
+
+ 21 Sep 2008; <solar@gentoo.org> splashutils-1.5.4.2.ebuild:
+ - Make cross compile aware. Avoid calls to built_with_use when doing x-compiles
13 Sep 2008; nixnut <nixnut@gentoo.org> splashutils-1.5.4.2.ebuild:
Stable on ppc wrt bug 237000
diff --git a/media-gfx/splashutils/Manifest b/media-gfx/splashutils/Manifest
index 9a41a8d85e6a..39bb36dc110d 100644
--- a/media-gfx/splashutils/Manifest
+++ b/media-gfx/splashutils/Manifest
@@ -8,6 +8,6 @@ DIST splashutils-lite-1.5.3.4.tar.bz2 414744 RMD160 a1d655786caa6a7bea84d5a17ea0
DIST splashutils-lite-1.5.4.2.tar.bz2 421894 RMD160 defb12e3cedccbfd3f3ebdf753053b24d1bd37da SHA1 ac1ef8b4eaa14c29a033ba94ea92aece0991995a SHA256 7f7e2956249504c4fcc77c407e3f31390a820c859c64377e51ff1bb83062fb53
DIST zlib-1.2.3.tar.bz2 425209 RMD160 cfba9984b354dcc38da49331457e6bfc861c6f51 SHA1 967e280f284d02284b0cd8872a8e2e04bfdc7283 SHA256 e3b9950851a19904d642c4dec518623382cf4d2ac24f70a76510c944330d28ca
EBUILD splashutils-1.5.3.4.ebuild 6698 RMD160 6d464e409c4ad39ce7d157f02d764a8142d70737 SHA1 e8f446958ff2ae66fb282d942715f2d0b16795e3 SHA256 485651af4a4e8c36316bd3e8b25d5f75f3a1383cbe692c89d2f0db53c715adec
-EBUILD splashutils-1.5.4.2.ebuild 6713 RMD160 6fb74786bcaec10aca2ee047b68894ea820bc737 SHA1 1d0ce1b0ffcfa45d89f46a6c0ad6768adc6e53f8 SHA256 17474ca57e180551e52daea5f47f907a01d07a0ed5b174196bfa3613501a2770
-MISC ChangeLog 27090 RMD160 e9a752dd09ed5cf8ddf2670e64d05bc84639a798 SHA1 5888d7a75b8f83bd7c13b277c6148e4e1db02393 SHA256 b4071f2e20f2850b37293b378f9573d300a29a031d2928301b85999118dd7ac2
+EBUILD splashutils-1.5.4.2.ebuild 6791 RMD160 6e1f85e1f437e770b2df042ed6089177f50f0882 SHA1 4fee8c5ea76da03ee6529dc2edce1b9a9f041220 SHA256 27511816ce0538cf06aecac6ac54b3c31432414b9a85e5dc67c8ed6bfd18ddde
+MISC ChangeLog 27234 RMD160 07cda9c816db98665690019d995700df50f1c31a SHA1 1842ce25c1b8103b895cb636fe8969a2a9c62a19 SHA256 5deca146f8b583b033f42a27c3f97cf02eec9855649000d0ab6c97bf27a05f4b
MISC metadata.xml 311 RMD160 77b41213be37a5c0c7d5822d480ae11acc1af542 SHA1 34dbe221785f338326999be3fdabc0a29df8cf31 SHA256 d548d0cef598c99abeeba18f5308fe482651ebea18746195d86e53ba334f3392
diff --git a/media-gfx/splashutils/splashutils-1.5.4.2.ebuild b/media-gfx/splashutils/splashutils-1.5.4.2.ebuild
index 7a602e755e8e..c16ce4af4509 100644
--- a/media-gfx/splashutils/splashutils-1.5.4.2.ebuild
+++ b/media-gfx/splashutils/splashutils-1.5.4.2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/splashutils-1.5.4.2.ebuild,v 1.3 2008/09/13 10:23:34 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/splashutils-1.5.4.2.ebuild,v 1.4 2008/09/21 07:16:19 solar Exp $
EAPI="1"
@@ -33,7 +33,7 @@ SRC_URI="mirror://berlios/fbsplash/${PN}-lite-${PV}.tar.bz2
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="amd64 ppc x86 ~arm"
RDEPEND="gpm? ( sys-libs/gpm )
truetype? ( >=media-libs/freetype-2 )
png? ( >=media-libs/libpng-1.2.7 )
@@ -71,7 +71,7 @@ src_unpack() {
cd "${S}"
ln -sf "${S}/src" "${WORKDIR}/core"
- if built_with_use sys-devel/gcc vanilla ; then
+ if ! tc-is-cross-compiler && built_with_use sys-devel/gcc vanilla; then
ewarn "Your GCC was built with the 'vanilla' flag set. If you can't compile"
ewarn "splashutils, you're on your own, as this configuration is not supported."
else
@@ -85,8 +85,9 @@ src_unpack() {
}
src_compile() {
+ tc-export CC
cd "${SM}"
- emake LIB=$(get_libdir) STRIP=true || die "failed to build miscsplashutils"
+ emake CC="${CC}" LIB=$(get_libdir) STRIP=true || die "failed to build miscsplashutils"
cd "${S}"
econf \
@@ -101,7 +102,7 @@ src_compile() {
--with-lpng-src=${LPNGSRC} \
--with-zlib-src=${ZLIBSRC} || die "failed to configure splashutils"
- emake -j1 || die "failed to build splashutils"
+ emake -j1 KLCC="${CC}" CC="${CC}" || die "failed to build splashutils"
if has_version ">=sys-apps/baselayout-1.13.99"; then
cd "${SG}"