summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2010-09-30 23:10:21 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2010-09-30 23:10:21 +0000
commitb05449c878c479e9bb56388841119cad3090aa79 (patch)
treeab05e932de2fea629a68c8aeb6394cfadbe035ed /sys-apps/hwinfo
parentChange NAME to SVCNAME in init script. (diff)
downloadhistorical-b05449c878c479e9bb56388841119cad3090aa79.tar.gz
historical-b05449c878c479e9bb56388841119cad3090aa79.tar.bz2
historical-b05449c878c479e9bb56388841119cad3090aa79.zip
Respect AR too
Package-Manager: portage-2.2_rc88/cvs/Linux x86_64
Diffstat (limited to 'sys-apps/hwinfo')
-rw-r--r--sys-apps/hwinfo/Manifest2
-rw-r--r--sys-apps/hwinfo/hwinfo-18.1.ebuild8
2 files changed, 8 insertions, 2 deletions
diff --git a/sys-apps/hwinfo/Manifest b/sys-apps/hwinfo/Manifest
index d981334a1ccf..11263979f589 100644
--- a/sys-apps/hwinfo/Manifest
+++ b/sys-apps/hwinfo/Manifest
@@ -5,6 +5,6 @@ DIST hwinfo-18.1-1.9.src.rpm 753469 RMD160 f9ae16e964d2e3e7c6e6e9bbc32c54c2c4609
DIST hwinfo_16.0-2.diff.gz 10005 RMD160 6c44c70d557072356e2f7dcb5bfe1c8fb201d56c SHA1 04feee8733b0558539f17f9dbcc59fe46d6444d3 SHA256 b9ccc66c531beaee419c4930b50b097796893f647cbc82a5274f834eacd13400
DIST hwinfo_16.0.orig.tar.gz 858557 RMD160 c80dddcef1416d29db31d036ef6a6affcd84841a SHA1 07a279906256e3a9a0ca99b959afff1edcf4e864 SHA256 6f46623806cdc5ea749b8e3f04caf18464becf3396c437ac058ae0b9768fe749
EBUILD hwinfo-16.0.ebuild 2702 RMD160 6ca08ab889de98a05c15ed27c000592614b5cb7d SHA1 0b97b567ecf95f62268b3bc67ff0205aa441b566 SHA256 273a1c1bae6a131688707182b31dafffecdd25cd4f15227c7d1a985763f52ecc
-EBUILD hwinfo-18.1.ebuild 1381 RMD160 458d07f5256b095320b253d7f6ddb78634a2393a SHA1 60cfad4ec8a16760423f2f57ae5dfe5cb2d87cc4 SHA256 2505673e0b1fb83c0527f28a3f23aefe48c77cd073eda64f2a99e5ca12e3b314
+EBUILD hwinfo-18.1.ebuild 1496 RMD160 af31d8029186d69c867211d190754564c9857610 SHA1 cb5f1f413f1631153c6305dc99580cc6f223ff65 SHA256 be1df8fb9ca2771004d599ab8f0cfc0e5fedd7879c80376a0658f0fed25851a6
MISC ChangeLog 2686 RMD160 c2a839d2079094230eeb0b7a96b144768a0f737a SHA1 4f7c3ee2f4399994228547b1b6b9cd93e5a84716 SHA256 6d1c4d39391090b1752459ed8c99edaf2cda2e6f947c4963e90a21f585827809
MISC metadata.xml 223 RMD160 ffa99612cf27469c417944deed0e0c9155e64331 SHA1 607c637402dd253406aa6ee684471a702c5d1a99 SHA256 d6bb9ba68629616062b4433ab3b8fb01dfcafae5bb47804d9e06cdd6c66daa44
diff --git a/sys-apps/hwinfo/hwinfo-18.1.ebuild b/sys-apps/hwinfo/hwinfo-18.1.ebuild
index cd40db4f6bb6..c39b3bf90c78 100644
--- a/sys-apps/hwinfo/hwinfo-18.1.ebuild
+++ b/sys-apps/hwinfo/hwinfo-18.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hwinfo/hwinfo-18.1.ebuild,v 1.2 2010/09/30 22:58:06 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hwinfo/hwinfo-18.1.ebuild,v 1.3 2010/09/30 23:10:21 ssuominen Exp $
EAPI=2
inherit multilib rpm toolchain-funcs
@@ -21,6 +21,11 @@ DEPEND="${RDEPEND}
MAKEOPTS="${MAKEOPTS} -j1"
src_prepare() {
+ # Respect AR variable.
+ sed -i \
+ -e 's:ar r:$(AR) r:' \
+ src/{,isdn,ids,smp,hd}/Makefile || die
+
# Avoid -I directories for dbus because HAL is obsolete.
sed -i -e '/CFLAGS/d' src/hd/Makefile || die
# Respect LDFLAGS.
@@ -36,6 +41,7 @@ src_prepare() {
}
src_compile() {
+ tc-export AR
emake CC="$(tc-getCC)" RPM_OPT_FLAGS="${CFLAGS}" || die
}