wok-6.x view blackbox/stuff/blackbox-0.70.1-asneeded.patch @ rev 21431
updated mercurial (3.5.1 -> 4.9.1)
| author | Hans-G?nter Theisgen |
|---|---|
| date | Sat Apr 27 10:26:40 2019 +0100 (2019-04-27) |
| parents | |
| children |
line source
1 Fixing build with as-needed. Enabling shared libs.
3 http://bugs.gentoo.org/show_bug.cgi?id=248549
5 --- src/Makefile.am
6 +++ src/Makefile.am
7 @@ -22,7 +22,7 @@
9 DEFAULT_MENU = $(pkgdatadir)/menu
10 DEFAULT_STYLE = $(pkgdatadir)/styles/Gray
11 -CPPFLAGS = @CPPFLAGS@ @SHAPE@ @XFT@ @DEBUG@ @NLS@ \
12 +AM_CPPFLAGS = @SHAPE@ @XFT@ @DEBUG@ @NLS@ \
13 -DLOCALEPATH=\"$(pkgdatadir)/nls\" \
14 -DDEFAULTMENU=\"$(DEFAULT_MENU)\" \
15 -DDEFAULTSTYLE=\"$(DEFAULT_STYLE)\" \
16 --- lib/Makefile.am
17 +++ lib/Makefile.am
18 @@ -62,7 +62,8 @@
19 Util.hh \
20 XDG.hh
22 -libbt_la_LIBADD = @ICONV@ @LOCALE@
23 +libbt_la_LIBADD = @ICONV@ @LOCALE@ @xft_LIBS@
24 +libbt_la_CFLAGS = @xft_CFLAGS@
26 pkgconfigdir = $(libdir)/pkgconfig
27 nodist_pkgconfig_DATA = libbt.pc
28 --- util/Makefile.am
29 +++ util/Makefile.am
30 @@ -21,7 +21,7 @@
31 # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
32 # DEALINGS IN THE SOFTWARE.
34 -CPPFLAGS = @CPPFLAGS@ @DEBUG@ @NLS@ \
35 +AM_CPPFLAGS = @DEBUG@ @NLS@ \
36 -I$(top_srcdir)/lib
38 bin_SCRIPTS = bsetbg
39 --- configure.ac
40 +++ configure.ac
41 @@ -29,7 +29,7 @@
42 AC_PROG_INSTALL
44 dnl libbt shouldn't be shared by default (yet)
45 -AC_DISABLE_SHARED
46 +dnl AC_DISABLE_SHARED
47 AC_PROG_LIBTOOL
48 AC_SUBST(LIBTOOL_DEPS)