[gentoo-commits] gentoo-x86 commit in x11-misc/wbar/files: wbar-2.1.3-as-needed.patch

[Kevin McCarthy (signals)]

signals     11/05/06 13:56:14

  Added:                wbar-2.1.3-as-needed.patch
  Log:
  Version bump.
  
  (Portage version: 2.2.0_alpha30/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  x11-misc/wbar/files/wbar-2.1.3-as-needed.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/wbar/files/wbar-2.1.3-as-needed.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/wbar/files/wbar-2.1.3-as-needed.patch?rev=1.1&content-type=text/plain

Index: wbar-2.1.3-as-needed.patch
===================================================================
Fix automake issues with having two Main.cc
Fix building with --as-needed

https://bugs.gentoo.org/358557

Patch provided by xarthisius@g.o for 2.1.1
Patch adapted to 2.1.3 by Kevin McCarthy <signals@g.o>

--- src/Makefile.am
+++ src/Makefile.am
@@ -27,7 +27,7 @@
 $(top_srcdir)/src/config/Run.cc \
 $(top_srcdir)/src/config/Functions.cc \
 $(top_srcdir)/src/config/Functions.h \
-$(top_srcdir)/src/config/Main.cc \
+$(top_srcdir)/src/config/Main-config.cc \
 $(UTILS)
 endif
 
@@ -42,11 +42,12 @@
 $(top_srcdir)/src/utils/OptParser.h \
 $(top_srcdir)/src/utils/i18n.h
 
-wbar_CPPFLAGS = @modules_CFLAGS@ -I$(top_srcdir)/src/utils
-wbar_LDFLAGS = @modules_LIBS@
+AM_CPPFLAGS = -I$(top_srcdir)/src/utils
+wbar_CXXFLAGS = @modules_CFLAGS@
+wbar_LDADD = @modules_LIBS@
 
 if WBAR_CONFIG
-wbar_config_CPPFLAGS = @gui_modules_CFLAGS@ -I$(top_srcdir)/src/utils
-wbar_config_LDFLAGS = @gui_modules_LIBS@
+wbar_config_CXXFLAGS = @gui_modules_CFLAGS@
+wbar_config_LDADD = @gui_modules_LIBS@
 endif