From 86f46e2b1851baa26f4b03e73950c9aced3cfa58 Mon Sep 17 00:00:00 2001 From: Jeroen Roovers Date: Sun, 27 Dec 2009 18:51:23 +0000 Subject: Fix compiling with --as-needed thanks to Kacper Kowalik (bug #298144). Package-Manager: portage-2.2_rc61/cvs/Linux i686 --- x11-wm/musca/ChangeLog | 6 +++++- x11-wm/musca/Manifest | 4 ++-- x11-wm/musca/files/musca-0.9.24-make.patch | 9 ++++----- 3 files changed, 11 insertions(+), 8 deletions(-) (limited to 'x11-wm/musca') diff --git a/x11-wm/musca/ChangeLog b/x11-wm/musca/ChangeLog index c8f317fd7454..d9ab25c6a22d 100644 --- a/x11-wm/musca/ChangeLog +++ b/x11-wm/musca/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-wm/musca # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-wm/musca/ChangeLog,v 1.10 2009/11/30 23:46:21 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-wm/musca/ChangeLog,v 1.11 2009/12/27 18:51:23 jer Exp $ + + 27 Dec 2009; Jeroen Roovers + files/musca-0.9.24-make.patch: + Fix compiling with --as-needed thanks to Kacper Kowalik (bug #298144). 30 Nov 2009; Jeroen Roovers musca-0.9.24.ebuild: Whitespace. diff --git a/x11-wm/musca/Manifest b/x11-wm/musca/Manifest index 8f8473e244dc..0af14a043b24 100644 --- a/x11-wm/musca/Manifest +++ b/x11-wm/musca/Manifest @@ -1,5 +1,5 @@ -AUX musca-0.9.24-make.patch 760 RMD160 1cd79b49fc9a844c6445fe7c4e11b78c398b2238 SHA1 60891a533485a4d1f5e610a0492f9764b26d3725 SHA256 51e3ffcae420fb33d4ae67a9445c0882446a0ced9a1a4c76e9fae20c8d321901 +AUX musca-0.9.24-make.patch 738 RMD160 642d956b2b87389e0155e64ef3ebdb3c285faf2e SHA1 16f0d60f97144b1da3b052a8a3882692e9e92fe5 SHA256 b1960cb2b796dab605dbfc1211abe789af1383069fbd245f729493f83464883d DIST musca-0.9.24.tgz 81210 RMD160 599e6539455b94d05a48485ad28f4b28ca7d73e1 SHA1 a74d27a352b76dccf09792a00e50ba3c05b9929b SHA256 c34e37e2df5075a61f8d5268786ab8115816af95c46e063c50f7f1c500527301 EBUILD musca-0.9.24.ebuild 1175 RMD160 9dc5352bceb15bbdd8b8ebcca6263809d436d1f1 SHA1 d214807e75a1dc043da9cfc575da842a95dd0266 SHA256 2b48c4096d94dfcd228c76092d2f9ab2adafc6cf20336248911435540eee9bd0 -MISC ChangeLog 1394 RMD160 258a5f460557ac669766625618fbd1e501d26692 SHA1 800969b1eb875a421ab8aa7f59cf723696d34b64 SHA256 1457754118c89d0760f0bbbe3710a8fc3a4c916ea3c29350ae7094eeb9a3ef91 +MISC ChangeLog 1548 RMD160 13fddfca3b652a6aa350430d3ba714b258729033 SHA1 9234ba1137f13b83b35302d98f3bc7fa2e64b8a1 SHA256 49c04dbae213a0f2b8e7b91bc8a9470fef48f289bfea97cc5a1c7dc571b5927f MISC metadata.xml 414 RMD160 48e7824340a745d8c0d30296aed143911bda4068 SHA1 c80f5d6a4342fe357f5e6be384bc9787b2d92243 SHA256 1c3fb26b847decbd35600a421d2ed11a494454cc463281c4d989f8341efb6029 diff --git a/x11-wm/musca/files/musca-0.9.24-make.patch b/x11-wm/musca/files/musca-0.9.24-make.patch index 371c804b758c..fdffa48e1075 100644 --- a/x11-wm/musca/files/musca-0.9.24-make.patch +++ b/x11-wm/musca/files/musca-0.9.24-make.patch @@ -1,11 +1,10 @@ ---- musca-0.9.24/Makefile.orig 2009-11-03 03:20:21.000000000 +0100 -+++ musca-0.9.24/Makefile 2009-11-30 21:39:04.000000000 +0100 -@@ -1,9 +1,15 @@ +--- musca-0.9.24.orig/Makefile 2009-11-03 03:20:21.000000000 +0100 ++++ musca-0.9.24/Makefile 2009-12-27 19:12:02.461539607 +0100 +@@ -1,9 +1,12 @@ -CFLAGS?=-Wall -g +CFLAGS ?= -Wall -g +INCLUDES = $(shell pkg-config --cflags x11) +LIBS = $(shell pkg-config --libs x11) -lm -+COMPILE = $(CC) $(CFLAGS) $(INCLUDES) $(LIBS) $(LDFLAGS) +BIN_DIST = musca apis xlisten -all: @@ -15,7 +14,7 @@ +all: $(BIN_DIST) + +$(BIN_DIST): -+ $(COMPILE) -o $@ $@.c ++ $(CC) $(CFLAGS) $(INCLUDES) $@.c -o $@ $(LDFLAGS) $(LIBS) clean: - rm -f musca apis -- cgit v1.2.3-65-gdbad