[gentoo-commits] gentoo-x86 commit in x11-wm/musca/files: musca-0.9.24-make.patch

[Jeroen Roovers (jer)]

jer         09/12/27 18:51:24

  Modified:             musca-0.9.24-make.patch
  Log:
  Fix compiling with --as-needed thanks to Kacper Kowalik (bug #298144).
  (Portage version: 2.2_rc61/cvs/Linux i686)

Revision  Changes    Path
1.2                  x11-wm/musca/files/musca-0.9.24-make.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-wm/musca/files/musca-0.9.24-make.patch?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-wm/musca/files/musca-0.9.24-make.patch?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-wm/musca/files/musca-0.9.24-make.patch?r1=1.1&r2=1.2

Index: musca-0.9.24-make.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-wm/musca/files/musca-0.9.24-make.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- musca-0.9.24-make.patch	30 Nov 2009 20:46:35 -0000	1.1
+++ musca-0.9.24-make.patch	27 Dec 2009 18:51:23 -0000	1.2
@@ -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