Fix compilation when using --as-needed by filtering it, for now.

Package-Manager: portage-2.1.4.4

diff --git a/sys-apps/hwsetup/ChangeLog b/sys-apps/hwsetup/ChangeLog
index ed9dce29baa91f9faa4997ccf238726a101ce91d..08985a9768f28052dbf656f109f008d3f40eb81f 100644 (file)
--- 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.51 2008/02/20 20:32:27 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hwsetup/ChangeLog,v 1.52 2008/03/07 19:06:43 wolf31o2 Exp $
+
+  07 Mar 2008; Chris Gianelloni <wolf31o2@gentoo.org> hwsetup-1.2.ebuild:
+  Fix compilation when using --as-needed by filtering it, for now.
 
   20 Feb 2008; Chris Gianelloni <wolf31o2@gentoo.org> hwsetup-1.2.ebuild:
   Removing USE=livecd since this package is now masked in the tree.

diff --git a/sys-apps/hwsetup/Manifest b/sys-apps/hwsetup/Manifest
index e760d117307bc3e4cc76c56cafae5f1ba88354f8..082b81aa023fa5f32f790a5bfcba4c8ad7113f59 100644 (file)
--- a/sys-apps/hwsetup/Manifest
+++ b/sys-apps/hwsetup/Manifest
@@ -5,13 +5,13 @@ AUX hwsetup-1.2-dyn_blacklist.patch 1972 RMD160 d72fec23a306e71fbd9402b043bf2ac8
 AUX hwsetup-1.2-fastprobe.patch 2817 RMD160 5cadca96d654739d61db18287bf2a71f4d7a00ca SHA1 9d05f2542f4fc9b8ae4ace559bec8a9720ea77b5 SHA256 9a16e4ddaada2bc115a48a6d60b5cac72d49f33c7eecf245f6337df627a4a0d0
 AUX hwsetup-1.2-gentoo.patch 1430 RMD160 fae21df5ef10085fe6336c483b5b2c2145f1f787 SHA1 b17b2ae05a819c9be68145f8ba5054dddf276a6d SHA256 1d1b6b3199b4a395febe7a68fc85a59c090ab99918f6a5e02739210e7c182e83
 DIST hwsetup_1.2-3.tar.gz 10828 RMD160 d3ce42ac74e5b0ccb9ae73fc0092f172b83a653a SHA1 101b42ee5016e250d69dbbfec7cd65e9d499eacd SHA256 faf346f5f342c0ab26631e31440632f6009ff206feafd1667a488e2f0ba4bb37
-EBUILD hwsetup-1.2.ebuild 1282 RMD160 a4cfa7e9a3578163c709eabcac670c625b97663a SHA1 a2f3a176ad370873f71eed61ccaf174052a8d9f1 SHA256 d9c9ee44c6d264453688bda03610b21c8bafc599e85b80263db92d1c1ec5dfca
-MISC ChangeLog 8146 RMD160 315b406292394e6726b39ba3cd5cca8e1625ab30 SHA1 c1a7a37f7e4671c3b115c06b6febc6e71ed2b1ea SHA256 b626527d10ddec05bed444912aa66d7a86cb605d6f68f3fbb4380ddae762affb
+EBUILD hwsetup-1.2.ebuild 1645 RMD160 78d06c52abc93da3ef4d39ad4c061e642ce2fece SHA1 9881a54abe8a6fc6947f72a7a67c30f1862d6ce1 SHA256 78346eb8b968492f1421f99dd4219fad5490977ec3c3516ef523f53e0d66aed4
+MISC ChangeLog 8288 RMD160 6aeccea3355a2a593d92808ae3c1e87a48b5537d SHA1 3669610d16e472cedbddd8739b43744681c3d22d SHA256 4d41e0db81d3dcae4a50eb0d9cb31d0d52847cfc69c0096c3bc4c65dfb393861
 MISC metadata.xml 159 RMD160 8db5ed254a6b9baf8f53368da9e71c5532a46073 SHA1 1e72098aafb1fa729eba6fc8357c7e732eb79dee SHA256 b6e17484225400d76c65d178bf5a10dc0a8da7f345993c2acc63d1093a77c90d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFHvI5wkT4lNIS36YERAgxrAJ4+lrmYJpLuudAop/+AL1A84mDSwQCgvFmj
-Sh3KB31y7J2koscSztthURc=
-=5QuP
+iD8DBQFH0ZIskT4lNIS36YERAnY4AJ9mhBSSrtPO3cbtgm1HqRC3pJWRdQCdGUND
+PPF0slvqX6ywJ30puzesqQE=
+=k4dJ
 -----END PGP SIGNATURE-----

diff --git a/sys-apps/hwsetup/hwsetup-1.2.ebuild b/sys-apps/hwsetup/hwsetup-1.2.ebuild
index 2346483ee5da12d120ce94993f4913d4098a4a5f..069dcac8e391cc37500ed53db8b0980f8e845c67 100644 (file)
--- a/sys-apps/hwsetup/hwsetup-1.2.ebuild
+++ b/sys-apps/hwsetup/hwsetup-1.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/sys-apps/hwsetup/hwsetup-1.2.ebuild,v 1.6 2008/02/20 20:32:27 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hwsetup/hwsetup-1.2.ebuild,v 1.7 2008/03/07 19:06:43 wolf31o2 Exp $
 
 inherit eutils toolchain-funcs flag-o-matic
 
@@ -30,6 +30,8 @@ src_unpack() {
 }
 
 src_compile() {
+       append-ldflags -s
+       filter-ldflags -Wl,--as-needed --as-needed
        if use zlib
        then
                append-ldflags -lz
@@ -43,3 +45,10 @@ src_compile() {
 src_install() {
        einstall DESTDIR="${D}" PREFIX=/usr MANDIR=/usr/share/man || die "Install failed"
 }
+
+pkg_postinst() {
+       ewarn "This package is intended for usage on the Gentoo release media.  If"
+       ewarn "you are not building a CD, remove this package.  It will not work"
+       ewarn "properly on a running system, as Gentoo does not use any of the"
+       ewarn "Knoppix-style detection except for CD builds."
+}