summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen Roovers <jer@gentoo.org>2009-12-27 18:51:23 +0000
committerJeroen Roovers <jer@gentoo.org>2009-12-27 18:51:23 +0000
commit2bd83362807bebfd4e3c9808332fbc6a55f8ee00 (patch)
tree82408a13e3357acae0cd102071feb1c8d5320e35 /x11-wm/musca
parentPackage move from app-editors/emacs-cvs to app-editors/emacs-vcs. (diff)
downloadgentoo-2-2bd83362807bebfd4e3c9808332fbc6a55f8ee00.tar.gz
gentoo-2-2bd83362807bebfd4e3c9808332fbc6a55f8ee00.tar.bz2
gentoo-2-2bd83362807bebfd4e3c9808332fbc6a55f8ee00.zip
Fix compiling with --as-needed thanks to Kacper Kowalik (bug #298144).
(Portage version: 2.2_rc61/cvs/Linux i686)
Diffstat (limited to 'x11-wm/musca')
-rw-r--r--x11-wm/musca/ChangeLog6
-rw-r--r--x11-wm/musca/files/musca-0.9.24-make.patch9
2 files changed, 9 insertions, 6 deletions
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 <jer@gentoo.org>
+ files/musca-0.9.24-make.patch:
+ Fix compiling with --as-needed thanks to Kacper Kowalik (bug #298144).
30 Nov 2009; Jeroen Roovers <jer@gentoo.org> musca-0.9.24.ebuild:
Whitespace.
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