summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen Roovers <jer@gentoo.org>2008-12-22 05:36:05 +0000
committerJeroen Roovers <jer@gentoo.org>2008-12-22 05:36:05 +0000
commit283a2f9e13a754f7d58e7f62643ae8c6aa810075 (patch)
tree73d9c9d9e01ca64a8ebd1fb3df8dd9fd86ee4c4b /sys-apps
parentStable for HPPA (bug #249875). (diff)
downloadhistorical-283a2f9e13a754f7d58e7f62643ae8c6aa810075.tar.gz
historical-283a2f9e13a754f7d58e7f62643ae8c6aa810075.tar.bz2
historical-283a2f9e13a754f7d58e7f62643ae8c6aa810075.zip
Do not let the Makefile append LDFLAGS (bug #252059).
Package-Manager: portage-2.2_rc17/cvs/Linux 2.6.25-gentoo-r7-JeR i686
Diffstat (limited to 'sys-apps')
-rw-r--r--sys-apps/hwsetup/ChangeLog6
-rw-r--r--sys-apps/hwsetup/Manifest5
-rw-r--r--sys-apps/hwsetup/files/1.2-strip.patch11
-rw-r--r--sys-apps/hwsetup/hwsetup-1.2-r1.ebuild5
4 files changed, 22 insertions, 5 deletions
diff --git a/sys-apps/hwsetup/ChangeLog b/sys-apps/hwsetup/ChangeLog
index 4ba1f2e3d671..b6453858996f 100644
--- a/sys-apps/hwsetup/ChangeLog
+++ b/sys-apps/hwsetup/ChangeLog
@@ -1,6 +1,10 @@
# 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.58 2008/10/14 09:30:11 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hwsetup/ChangeLog,v 1.59 2008/12/22 05:36:05 jer Exp $
+
+ 22 Dec 2008; Jeroen Roovers <jer@gentoo.org> +files/1.2-strip.patch,
+ hwsetup-1.2-r1.ebuild:
+ Do not let the Makefile append LDFLAGS (bug #252059).
14 Oct 2008; Robin H. Johnson <robbat2@gentoo.org> hwsetup-1.2-r1.ebuild:
Bug #226923, fix append-ldflags usage.
diff --git a/sys-apps/hwsetup/Manifest b/sys-apps/hwsetup/Manifest
index 2918ed50caae..d0afd64ab0e7 100644
--- a/sys-apps/hwsetup/Manifest
+++ b/sys-apps/hwsetup/Manifest
@@ -3,9 +3,10 @@ AUX 1.2-3-fastprobe.patch 2817 RMD160 5cadca96d654739d61db18287bf2a71f4d7a00ca S
AUX 1.2-3-gentoo.patch 1430 RMD160 fae21df5ef10085fe6336c483b5b2c2145f1f787 SHA1 b17b2ae05a819c9be68145f8ba5054dddf276a6d SHA256 1d1b6b3199b4a395febe7a68fc85a59c090ab99918f6a5e02739210e7c182e83
AUX 1.2-7-dyn_blacklist.patch 1996 RMD160 e299ee153e13f9a80d7a28209cf62268dfb9e8bd SHA1 192ea0961e02a1a84b6efc98a02b360d859d4ca1 SHA256 625c60827eea5f17b5d833276cf7924223e6ab1fa681f8518c4e8e1070465339
AUX 1.2-7-gentoo.patch 726 RMD160 4fee01b484f303d5a5b36099f72e18e31e165ca5 SHA1 bc793c3c496010db48f5b9ba6e6e6ae90c813676 SHA256 bd244624e9fc761c7c72ecd98a7aa4133e2d4858172ba336f5bc9596a67c8f51
+AUX 1.2-strip.patch 306 RMD160 51e82ddb0bd75fe3e8764123404942c3ded05aba SHA1 1603a3e694ee09257aae0c6d3940512eae5655dc SHA256 038593c6117ed213451d9a3cb781d1635117d54afb0bcf02f165a49d412cd47c
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 1960 RMD160 078c2344e4106aa8ccf46cfd7397730adac55bb9 SHA1 32a3cc8fc842e8181ff9be204fcbc14ceb38035b SHA256 b9e25f2e59cc7436e4183755c46fb396ad78bbc4a42739257c5eb69c1ee31cc1
+EBUILD hwsetup-1.2-r1.ebuild 1992 RMD160 8c1509b86bd63ae5019cb79c0682f79f93a42f26 SHA1 0070dcffd5bd116e3db2c51f1d90d34527148083 SHA256 b9da9c24ff93fc1532f8a450a45691d54f5f5a080ea1f471d07c8e05fbeb15af
EBUILD hwsetup-1.2.ebuild 1739 RMD160 5700da36acc6aee986f3e376a14b5636b6e36f51 SHA1 4c22d2eb39d810e4ab8c1de48ea7ac089aa53523 SHA256 7dce693cd9bba8fd1d11974ecbc1c272861d8cad0ca8db513645cedab087aa1f
-MISC ChangeLog 9544 RMD160 37cdecacc0be02b71a7482ab2b13e07d90c37d14 SHA1 e6a7c8b7157255e0f21d45074897c931ec1e8129 SHA256 5ad83f3e6f272a0366c29713437a1389575e405716afc26a5cf995f79ad2ac69
+MISC ChangeLog 9693 RMD160 cb96f482ec9377532baac2f6b5228c8ca4a5a5fc SHA1 40256748ab6aff550b23577062bce20b41e90d5f SHA256 0f27f7b02d08ebf099b6583bf6144d7475e9126acfd93fb507d05d1387794afa
MISC metadata.xml 159 RMD160 8db5ed254a6b9baf8f53368da9e71c5532a46073 SHA1 1e72098aafb1fa729eba6fc8357c7e732eb79dee SHA256 b6e17484225400d76c65d178bf5a10dc0a8da7f345993c2acc63d1093a77c90d
diff --git a/sys-apps/hwsetup/files/1.2-strip.patch b/sys-apps/hwsetup/files/1.2-strip.patch
new file mode 100644
index 000000000000..f1b853760096
--- /dev/null
+++ b/sys-apps/hwsetup/files/1.2-strip.patch
@@ -0,0 +1,11 @@
+--- hwsetup-1.2/Makefile.orig 2005-05-07 15:20:44.000000000 +0200
++++ hwsetup-1.2/Makefile 2008-12-22 06:27:41.000000000 +0100
+@@ -3,7 +3,7 @@
+ # define BLACKLIST to avoid loading potentially dangerous modules
+ CFLAGS=-DBLACKLIST -Wall -fPIC
+ OPT=-O2
+-LDFLAGS=-s
++#LDFLAGS=-s
+ LIBS=-lkudzu -lpci
+ CC=gcc
+
diff --git a/sys-apps/hwsetup/hwsetup-1.2-r1.ebuild b/sys-apps/hwsetup/hwsetup-1.2-r1.ebuild
index 07278a5109a9..d422f9ed2a46 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.3 2008/10/14 09:30:11 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hwsetup/hwsetup-1.2-r1.ebuild,v 1.4 2008/12/22 05:36:05 jer Exp $
inherit eutils toolchain-funcs flag-o-matic
@@ -33,7 +33,8 @@ src_unpack() {
epatch \
"${FILESDIR}"/${MY_PV}-dyn_blacklist.patch \
"${FILESDIR}"/${PV}-3-fastprobe.patch \
- "${FILESDIR}"/${MY_PV}-gentoo.patch
+ "${FILESDIR}"/${MY_PV}-gentoo.patch \
+ "${FILESDIR}"/${PV}-strip.patch
}
src_compile() {