| 1 |
xarthisius 10/05/30 13:46:27 |
| 2 |
|
| 3 |
Added: bbweather-asneeded.patch |
| 4 |
Log: |
| 5 |
Version bump, also fixing build with as-needed wrt bug 248556. Thanks Diego for reporting |
| 6 |
(Portage version: 2.1.8.3/cvs/Linux x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 x11-misc/bbweather/files/bbweather-asneeded.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/bbweather/files/bbweather-asneeded.patch?rev=1.1&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/bbweather/files/bbweather-asneeded.patch?rev=1.1&content-type=text/plain |
| 13 |
|
| 14 |
Index: bbweather-asneeded.patch |
| 15 |
=================================================================== |
| 16 |
Fixing build with as-needed |
| 17 |
|
| 18 |
https://bugs.gentoo.org/248556 |
| 19 |
|
| 20 |
--- configure.in |
| 21 |
+++ configure.in |
| 22 |
@@ -56,15 +56,10 @@ |
| 23 |
AC_PATH_X |
| 24 |
AC_PATH_XTRA |
| 25 |
|
| 26 |
-CFLAGS="$CFLAGS $X_CFLAGS" |
| 27 |
-CXXFLAGS="$CXXFLAGS $X_CFLAGS" |
| 28 |
-LDFLAGS="$LDFLAGS $X_LIBS $X_PRE_LIBS" |
| 29 |
DATADIR=$datadir |
| 30 |
dnl Checks for X libraries. |
| 31 |
-AC_CHECK_LIB(X11, XOpenDisplay, LDFLAGS="$LDFLAGS -lX11", |
| 32 |
- AC_MSG_ERROR(XOpenDisplay not found in -lX11)) |
| 33 |
- |
| 34 |
-LDFLAGS="$LDFLAGS $X_EXTRA_LIBS" |
| 35 |
+AC_CHECK_LIB([X11], [XOpenDisplay], , |
| 36 |
+ AC_MSG_ERROR(XOpenDisplay not found in -lX11), ) |
| 37 |
|
| 38 |
dnl Checks for header files. |
| 39 |
AC_HEADER_STDC |
| 40 |
--- Makefile.am |
| 41 |
+++ Makefile.am |
| 42 |
@@ -1,5 +1,4 @@ |
| 43 |
-CPPFLAGS = @CPPFLAGS@ \ |
| 44 |
- -DDEFAULT_CONF=\"$(datadir)/bbtools/bbweather.conf\" \ |
| 45 |
+AM_CPPFLAGS = -DDEFAULT_CONF=\"$(datadir)/bbtools/bbweather.conf\" \ |
| 46 |
-DDEFAULT_NOBB=\"$(datadir)/bbtools/bbweather.nobb\" |
| 47 |
|
| 48 |
|
| 49 |
@@ -13,4 +12,5 @@ |
| 50 |
Basewindow.cpp Basewindow.h \ |
| 51 |
blackboxstyle.h |
| 52 |
EXTRA_DIST = BUGS TODO |
| 53 |
-bbweather_LDADD = @X_LIBS@ |
| 54 |
+bbweather_LDADD = @X_PRE_LIBS@ @X_LIBS@ @X_EXTRA_LIBS@ |
| 55 |
+bbweather_CFLAGS = @X_PRE_CFLAGS@ @X_CFLAGS@ @X_EXTRA_CFLAGS@ |
Archives