[gentoo-commits] gentoo-x86 commit in x11-plugins/wmauda/files: wmauda-0.7-asneeded.patch

[gentoo-commits] gentoo-x86 commit in x11-plugins/wmauda/files: wmauda-0.7-asneeded.patch

[Samuli Suominen (ssuominen)]

ssuominen    10/06/20 17:05:35

  Added:                wmauda-0.7-asneeded.patch
  Log:
  Fix building with -Wl,--as-needed wrt #320795 by Kacper Kowalik.
  (Portage version: 2.2_rc67/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  x11-plugins/wmauda/files/wmauda-0.7-asneeded.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-plugins/wmauda/files/wmauda-0.7-asneeded.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-plugins/wmauda/files/wmauda-0.7-asneeded.patch?rev=1.1&content-type=text/plain

Index: wmauda-0.7-asneeded.patch
===================================================================
Fixing build with as-needed, respecting LDFLAGS

http://bugs.gentoo.org/show_bug.cgi?id=320795

--- Makefile
+++ Makefile
@@ -7,14 +7,14 @@
 PIXMAP_DIR	:= $(PREFIX)/share/pixmaps
 MANPAGE_DIR	:= $(PREFIX)/share/man/man1
 
-CFLAGS 	+= $(shell pkg-config audacious --cflags) $(shell pkg-config dbus-1 --cflags)
-LIBS 	:= $(shell pkg-config audacious --libs)   $(shell pkg-config dbus-1 --libs)
+CFLAGS 	+= $(shell pkg-config audclient --cflags) $(shell pkg-config dbus-1 --cflags)
+LIBS 	:= $(shell pkg-config audclient --libs)   $(shell pkg-config dbus-1 --libs)
 
 OBJS 	= wmauda.o
 HEADERS = config.h dock-master.xpm
 
 wmauda:	$(OBJS) $(HEADERS)
-	$(CC) -o wmauda $(OBJS) $(CFLAGS) $(LIBS)
+	$(CC) $(LDFLAGS) -o wmauda $(OBJS) $(CFLAGS) $(LIBS)
 
 all:	wmauda
 

[gentoo-commits] gentoo-x86 commit in x11-plugins/wmauda/files: wmauda-0.7-asneeded.patch

[Bernard Cafarelli (voyageur)]

voyageur    11/06/06 19:57:27

  Modified:             wmauda-0.7-asneeded.patch
  Log:
  Update as-needed patch to fix underlinking problem, bug #369889
  
  (Portage version: 2.2.0_alpha38/cvs/Linux x86_64)

Revision  Changes    Path
1.2                  x11-plugins/wmauda/files/wmauda-0.7-asneeded.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-plugins/wmauda/files/wmauda-0.7-asneeded.patch?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-plugins/wmauda/files/wmauda-0.7-asneeded.patch?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-plugins/wmauda/files/wmauda-0.7-asneeded.patch?r1=1.1&r2=1.2

Index: wmauda-0.7-asneeded.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-plugins/wmauda/files/wmauda-0.7-asneeded.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- wmauda-0.7-asneeded.patch	20 Jun 2010 17:05:34 -0000	1.1
+++ wmauda-0.7-asneeded.patch	6 Jun 2011 19:57:26 -0000	1.2
@@ -1,6 +1,7 @@
 Fixing build with as-needed, respecting LDFLAGS
-
 http://bugs.gentoo.org/show_bug.cgi?id=320795
+Also fix underlinking, adding missing -lX11
+http://bugs.gentoo.org/show_bug.cgi?id=369889
 
 --- Makefile
 +++ Makefile
@@ -11,7 +12,7 @@
 -CFLAGS 	+= $(shell pkg-config audacious --cflags) $(shell pkg-config dbus-1 --cflags)
 -LIBS 	:= $(shell pkg-config audacious --libs)   $(shell pkg-config dbus-1 --libs)
 +CFLAGS 	+= $(shell pkg-config audclient --cflags) $(shell pkg-config dbus-1 --cflags)
-+LIBS 	:= $(shell pkg-config audclient --libs)   $(shell pkg-config dbus-1 --libs)
++LIBS 	:= $(shell pkg-config audclient --libs)   $(shell pkg-config dbus-1 --libs) -lX11
  
  OBJS 	= wmauda.o
  HEADERS = config.h dock-master.xpm