| 1 |
xarthisius 10/05/30 17:29:24 |
| 2 |
|
| 3 |
Added: bbtime-0.1.5-asneeded.patch |
| 4 |
Log: |
| 5 |
Fixing build with as-needed wrt bug 248555. Thanks Diego for report |
| 6 |
(Portage version: 2.1.8.3/cvs/Linux x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 x11-misc/bbtime/files/bbtime-0.1.5-asneeded.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/bbtime/files/bbtime-0.1.5-asneeded.patch?rev=1.1&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/bbtime/files/bbtime-0.1.5-asneeded.patch?rev=1.1&content-type=text/plain |
| 13 |
|
| 14 |
Index: bbtime-0.1.5-asneeded.patch |
| 15 |
=================================================================== |
| 16 |
Fixing build with as-needed |
| 17 |
|
| 18 |
https://bugs.gentoo.org/show_bug.cgi?id=248555 |
| 19 |
|
| 20 |
--- configure.in |
| 21 |
+++ configure.in |
| 22 |
@@ -47,14 +47,9 @@ |
| 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 |
dnl Checks for X libraries. |
| 30 |
-AC_CHECK_LIB(X11, XOpenDisplay, LDFLAGS="$LDFLAGS -lX11", |
| 31 |
- AC_MSG_ERROR(XOpenDisplay not found in -lX11)) |
| 32 |
- |
| 33 |
-LDFLAGS="$LDFLAGS $X_EXTRA_LIBS" |
| 34 |
+AC_CHECK_LIB([X11], [XOpenDisplay], , |
| 35 |
+ AC_MSG_ERROR(XOpenDisplay not found in -lX11),) |
| 36 |
|
| 37 |
dnl Checks for header files. |
| 38 |
AC_HEADER_STDC |
| 39 |
--- Makefile.am |
| 40 |
+++ Makefile.am |
| 41 |
@@ -1,5 +1,4 @@ |
| 42 |
-CPPFLAGS = @CPPFLAGS@ \ |
| 43 |
- -DDEFAULT_CONF=\"$(datadir)/bbtools/bbtime.conf\" \ |
| 44 |
+AM_CPPFLAGS = -DDEFAULT_CONF=\"$(datadir)/bbtools/bbtime.conf\" \ |
| 45 |
-DDEFAULT_NOBB=\"$(datadir)/bbtools/bbtime.nobb\" |
| 46 |
|
| 47 |
|
| 48 |
@@ -14,4 +13,5 @@ |
| 49 |
timemenu.cc timemenu.hh \ |
| 50 |
blackboxstyle.hh |
| 51 |
EXTRA_DIST = BUGS TODO |
| 52 |
-bbtime_LDADD = @X_LIBS@ |
| 53 |
+bbtime_LDADD = @X_PRE_LIBS@ @X_LIBS@ @X_EXTRA_LIBS@ |
| 54 |
+bbtime_CFLAGS = @X_PRE_CFLAGS@ @X_CGLAGS@ @X_EXTRA_CFLAGS@ |
Archives