[gentoo-commits] gentoo-x86 commit in x11-misc/bbweather/files: bbweather-asneeded.patch

[gentoo-commits] gentoo-x86 commit in x11-misc/bbweather/files: bbweather-asneeded.patch

[Kacper Kowalik (xarthisius)]

xarthisius    10/05/30 13:46:27

  Added:                bbweather-asneeded.patch
  Log:
  Version bump, also fixing build with as-needed wrt bug 248556. Thanks Diego for reporting
  (Portage version: 2.1.8.3/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  x11-misc/bbweather/files/bbweather-asneeded.patch

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

Index: bbweather-asneeded.patch
===================================================================
Fixing build with as-needed

https://bugs.gentoo.org/248556

--- configure.in
+++ configure.in
@@ -56,15 +56,10 @@
 AC_PATH_X
 AC_PATH_XTRA
 
-CFLAGS="$CFLAGS $X_CFLAGS"
-CXXFLAGS="$CXXFLAGS $X_CFLAGS"
-LDFLAGS="$LDFLAGS $X_LIBS $X_PRE_LIBS"
 DATADIR=$datadir
 dnl Checks for X libraries.
-AC_CHECK_LIB(X11, XOpenDisplay, LDFLAGS="$LDFLAGS -lX11",
-             AC_MSG_ERROR(XOpenDisplay not found in -lX11))
-
-LDFLAGS="$LDFLAGS $X_EXTRA_LIBS"
+AC_CHECK_LIB([X11], [XOpenDisplay], ,
+             AC_MSG_ERROR(XOpenDisplay not found in -lX11), )
 
 dnl Checks for header files.
 AC_HEADER_STDC
--- Makefile.am
+++ Makefile.am
@@ -1,5 +1,4 @@
-CPPFLAGS =	@CPPFLAGS@ \
-		-DDEFAULT_CONF=\"$(datadir)/bbtools/bbweather.conf\" \
+AM_CPPFLAGS =	-DDEFAULT_CONF=\"$(datadir)/bbtools/bbweather.conf\" \
 		-DDEFAULT_NOBB=\"$(datadir)/bbtools/bbweather.nobb\"
 
 
@@ -13,4 +12,5 @@
 		 Basewindow.cpp Basewindow.h \
 		 blackboxstyle.h
 EXTRA_DIST = BUGS TODO
-bbweather_LDADD = @X_LIBS@
+bbweather_LDADD = @X_PRE_LIBS@ @X_LIBS@ @X_EXTRA_LIBS@
+bbweather_CFLAGS = @X_PRE_CFLAGS@ @X_CFLAGS@ @X_EXTRA_CFLAGS@