diff options
| author |   Robin H. Johnson <robbat2@gentoo.org> | 2008-10-14 09:30:11 +0000 |
|---|---|---|
| committer | Robin H. Johnson <robbat2@gentoo.org> | 2008-10-14 09:30:11 +0000 |
| commit | fe15889a48d8cf1db86ebd4ac29062b5f333206b (patch) | |
| tree | 81ec1ba4f3ad28adc3e6e8840842ea3209fd6cc0 /sys-apps | |
| parent | Fix bug #226887. (diff) | |
| download | historical-fe15889a48d8cf1db86ebd4ac29062b5f333206b.tar.gz historical-fe15889a48d8cf1db86ebd4ac29062b5f333206b.tar.bz2 historical-fe15889a48d8cf1db86ebd4ac29062b5f333206b.zip | |
Bug #226923, fix append-ldflags usage.
Package-Manager: portage-2.2_rc11/cvs/Linux 2.6.27-rc1-10246-gca5de40 x86_64
Diffstat (limited to 'sys-apps')
| -rw-r--r-- | sys-apps/hwsetup/ChangeLog | 5 | ||||
| -rw-r--r-- | sys-apps/hwsetup/Manifest | 4 | ||||
| -rw-r--r-- | sys-apps/hwsetup/hwsetup-1.2-r1.ebuild | 12 |
3 files changed, 12 insertions, 9 deletions
diff --git a/sys-apps/hwsetup/ChangeLog b/sys-apps/hwsetup/ChangeLog index 11f8ae82a909..4ba1f2e3d671 100644 --- a/sys-apps/hwsetup/ChangeLog +++ b/sys-apps/hwsetup/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for sys-apps/hwsetup # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/hwsetup/ChangeLog,v 1.57 2008/09/04 12:39:37 yngwin Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/hwsetup/ChangeLog,v 1.58 2008/10/14 09:30:11 robbat2 Exp $ + + 14 Oct 2008; Robin H. Johnson <robbat2@gentoo.org> hwsetup-1.2-r1.ebuild: + Bug #226923, fix append-ldflags usage. 04 Sep 2008; Ben de Groot <yngwin@gentoo.org> hwsetup-1.2-r1.ebuild: Unmasking and stabilizing latest version, adding warning, on behalf of diff --git a/sys-apps/hwsetup/Manifest b/sys-apps/hwsetup/Manifest index fadad3c623cd..2918ed50caae 100644 --- a/sys-apps/hwsetup/Manifest +++ b/sys-apps/hwsetup/Manifest @@ -5,7 +5,7 @@ AUX 1.2-7-dyn_blacklist.patch 1996 RMD160 e299ee153e13f9a80d7a28209cf62268dfb9e8 AUX 1.2-7-gentoo.patch 726 RMD160 4fee01b484f303d5a5b36099f72e18e31e165ca5 SHA1 bc793c3c496010db48f5b9ba6e6e6ae90c813676 SHA256 bd244624e9fc761c7c72ecd98a7aa4133e2d4858172ba336f5bc9596a67c8f51 DIST hwsetup_1.2-3.tar.gz 10828 RMD160 d3ce42ac74e5b0ccb9ae73fc0092f172b83a653a SHA1 101b42ee5016e250d69dbbfec7cd65e9d499eacd SHA256 faf346f5f342c0ab26631e31440632f6009ff206feafd1667a488e2f0ba4bb37 DIST hwsetup_1.2-7.tar.gz 10706 RMD160 7895b32c81254b2ca1575ab12dcc6fa39d011e17 SHA1 c91cb22c07755ecbfce8e9e6826e8e2580f103f8 SHA256 aa72b37ce306b5191cabd31eb5f19ab2a5e635697a263c6735d10c7bf99f9589 -EBUILD hwsetup-1.2-r1.ebuild 1917 RMD160 5e3edb51a49c502b6fbb2d40d73254f24d160054 SHA1 91da5ce012682d4bff485f040fc3c75bd97dbf55 SHA256 1608658da2c5176ca5e9190461e2abba9bea47fda285f539e3a3f4122b243d3a +EBUILD hwsetup-1.2-r1.ebuild 1960 RMD160 078c2344e4106aa8ccf46cfd7397730adac55bb9 SHA1 32a3cc8fc842e8181ff9be204fcbc14ceb38035b SHA256 b9e25f2e59cc7436e4183755c46fb396ad78bbc4a42739257c5eb69c1ee31cc1 EBUILD hwsetup-1.2.ebuild 1739 RMD160 5700da36acc6aee986f3e376a14b5636b6e36f51 SHA1 4c22d2eb39d810e4ab8c1de48ea7ac089aa53523 SHA256 7dce693cd9bba8fd1d11974ecbc1c272861d8cad0ca8db513645cedab087aa1f -MISC ChangeLog 9425 RMD160 e8b8c1e4ff4ff8098894aeb989bcc0c227fd1fc7 SHA1 238453c3ee4b1bd3f113a387a81a7984c6799b00 SHA256 afdecbc161911c12e820e8eff14739065f4a1e51dcb94dd0a2c8100808a2c6ff +MISC ChangeLog 9544 RMD160 37cdecacc0be02b71a7482ab2b13e07d90c37d14 SHA1 e6a7c8b7157255e0f21d45074897c931ec1e8129 SHA256 5ad83f3e6f272a0366c29713437a1389575e405716afc26a5cf995f79ad2ac69 MISC metadata.xml 159 RMD160 8db5ed254a6b9baf8f53368da9e71c5532a46073 SHA1 1e72098aafb1fa729eba6fc8357c7e732eb79dee SHA256 b6e17484225400d76c65d178bf5a10dc0a8da7f345993c2acc63d1093a77c90d diff --git a/sys-apps/hwsetup/hwsetup-1.2-r1.ebuild b/sys-apps/hwsetup/hwsetup-1.2-r1.ebuild index 77f3c72f383a..07278a5109a9 100644 --- a/sys-apps/hwsetup/hwsetup-1.2-r1.ebuild +++ b/sys-apps/hwsetup/hwsetup-1.2-r1.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/sys-apps/hwsetup/hwsetup-1.2-r1.ebuild,v 1.2 2008/09/04 12:39:37 yngwin Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/hwsetup/hwsetup-1.2-r1.ebuild,v 1.3 2008/10/14 09:30:11 robbat2 Exp $ inherit eutils toolchain-funcs flag-o-matic @@ -39,11 +39,11 @@ src_unpack() { src_compile() { append-ldflags -s filter-ldflags -Wl,--as-needed --as-needed - if use zlib - then - append-ldflags -lz - elif built_with_use --missing false sys-apps/pciutils zlib - then + if use zlib ; then + sed -i \ + -e '/^LIBS=/s,-lpci,-lz -lpci,g' \ + Makefile + elif built_with_use --missing false sys-apps/pciutils zlib ; then die "You need to build with USE=zlib to match sys-apps/pcituils" fi emake LDFLAGS="${LDFLAGS}" OPT="${CFLAGS}" CC="$(tc-getCC)" || die "emake failed" |