summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichele Noberasco <s4t4n@gentoo.org>2010-08-31 10:20:23 +0000
committerMichele Noberasco <s4t4n@gentoo.org>2010-08-31 10:20:23 +0000
commite5513837800a628ecb57c0ca26de936a9ea138f0 (patch)
tree3818c62dacef5d12fac0528292d242462ebe639c /x11-plugins
parentVersion bump to TuxOnIce 3.2-rc1, bug #334787. (diff)
downloadhistorical-e5513837800a628ecb57c0ca26de936a9ea138f0.tar.gz
historical-e5513837800a628ecb57c0ca26de936a9ea138f0.tar.bz2
historical-e5513837800a628ecb57c0ca26de936a9ea138f0.zip
Honour LDFLAGS. Fixes bug #334741.
Package-Manager: portage-2.1.8.3/cvs/Linux i686
Diffstat (limited to 'x11-plugins')
-rw-r--r--x11-plugins/wmget/ChangeLog7
-rw-r--r--x11-plugins/wmget/Manifest4
-rw-r--r--x11-plugins/wmget/wmget-0.6.0.ebuild12
3 files changed, 13 insertions, 10 deletions
diff --git a/x11-plugins/wmget/ChangeLog b/x11-plugins/wmget/ChangeLog
index 40256cea115c..379c4c1d9462 100644
--- a/x11-plugins/wmget/ChangeLog
+++ b/x11-plugins/wmget/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for x11-plugins/wmget
-# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmget/ChangeLog,v 1.16 2008/12/02 10:42:35 s4t4n Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmget/ChangeLog,v 1.17 2010/08/31 10:20:23 s4t4n Exp $
+
+ 31 Aug 2010; Michele Noberasco <s4t4n@gentoo.org> wmget-0.6.0.ebuild:
+ Honour LDFLAGS. Fixes bug #334741.
02 Dec 2008; Michele Noberasco <s4t4n@gentoo.org> wmget-0.6.0.ebuild:
Fix LDFLAGS ordering. Fixes bug #248641.
diff --git a/x11-plugins/wmget/Manifest b/x11-plugins/wmget/Manifest
index 696d045677eb..34b6926ea171 100644
--- a/x11-plugins/wmget/Manifest
+++ b/x11-plugins/wmget/Manifest
@@ -1,4 +1,4 @@
DIST wmget-0.6.0-src.tar.gz 41155 RMD160 5caefbb15c66e38c4c3677428a086f49e4a529a3 SHA1 936fa30702c65216dc0371fcd3e5d2104bced1f8 SHA256 738b8e22a75f3ed538e473a66908091a13f928f7b163caf2aa79e687f72c32a7
-EBUILD wmget-0.6.0.ebuild 1050 RMD160 0820875325c88a8c05a1153bc12c29e4234cd090 SHA1 aab7e4ef264c1c05e728e26558556378dd5fb555 SHA256 49a10956dc3560c5df0c8d210a9681ccd8c7e3b3a9916c85e17a93e1fafdba7b
-MISC ChangeLog 1901 RMD160 cad330d5a9b618d5acf66a72ddf358eb2c2f0d61 SHA1 1846eee964735d0d76e6a3d9901062dc7d669fa5 SHA256 341111bb499c15f3a945cb457473dc3230bed1499f694919dd49d52e6882f29c
+EBUILD wmget-0.6.0.ebuild 1085 RMD160 53a2b64c93a9c31325adf843379a74ae532da732 SHA1 51c4b13cd4c7a9d88abfc76779c8aa3a31a0d83f SHA256 29f5e9c9b74300ad9dc47760d887465384a1b30c87d661062293321f7a82a22a
+MISC ChangeLog 2011 RMD160 1617d92d6b61756e666e63878a3d6748246c7f1e SHA1 eaa24078f1ec4a0e2df448d01debd38cd9ebe87a SHA256 9613c8f2a847ad014463b83cd76f122f79ce84d168e21c575b7f7ffc518c4f21
MISC metadata.xml 436 RMD160 d6b8a72fc8385ab61c87088d4038cdbd76d0b6f3 SHA1 6cbe22c2499e1ed5f46be0ef1f2e16e817d22e77 SHA256 25b2d9f13f66c9ad402b63faf0e05062df65d73ef4fe5f2b5ba2cd9a4fdb4a47
diff --git a/x11-plugins/wmget/wmget-0.6.0.ebuild b/x11-plugins/wmget/wmget-0.6.0.ebuild
index 53fc3d6c5d64..990c7cdd293f 100644
--- a/x11-plugins/wmget/wmget-0.6.0.ebuild
+++ b/x11-plugins/wmget/wmget-0.6.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmget/wmget-0.6.0.ebuild,v 1.9 2008/12/02 10:42:35 s4t4n Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmget/wmget-0.6.0.ebuild,v 1.10 2010/08/31 10:20:23 s4t4n Exp $
inherit toolchain-funcs
@@ -25,14 +25,14 @@ S=${WORKDIR}/${PN}
src_unpack() {
unpack ${A}
- sed -i -e "s:ar rc:$(tc-getAR) rc:" "${S}"/dockapp/Makefile
- #Fix LDFLAGS ordering for bug #248641
- sed -i 's/$(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) $(DALIB) -o $@/$(CC) $(CFLAGS) $(OBJS) $(DALIB) -o $@ $(LDFLAGS)/' "${S}"/Makefile
+ sed -i -e "s:ar rc:$(tc-getAR) rc:" "${S}"/dockapp/Makefile
+ sed -i 's/$(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) $(DALIB) -o $@/$(CC) $(CFLAGS) $(OBJS) $(DALIB) $(LDFLAGS) -o $@ $(LIBS)/' "${S}"/Makefile
+ sed -i 's/LDFLAGS=/LIBS=/' "${S}"/Makefile
}
src_compile() {
- emake -j1 CFLAGS="${CFLAGS}" CC="$(tc-getCC)" || die "emake failed."
+ emake -j1 CFLAGS="${CFLAGS}" CC="$(tc-getCC)" LDFLAGS="${LDFLAGS}" || die "emake failed."
}
src_install() {