Imported Debian patch 0.26.0-2
Andrew Shadura authored 10 years ago
Andrew Shadura committed 8 years ago
|
0 |
mk-configure (0.26.0-2) unstable; urgency=low
|
|
1 |
|
|
2 |
* Fix pkg-config checks (Closes: #741837).
|
|
3 |
|
|
4 |
-- Andrew Shadura <andrewsh@debian.org> Sun, 16 Mar 2014 15:29:25 +0100
|
|
5 |
|
0 | 6 |
mk-configure (0.26.0-1) unstable; urgency=low
|
1 | 7 |
|
2 | 8 |
* New upstream release.
|
|
0 |
--- a/mk/mkc_imp.pkg-config.mk
|
|
1 |
+++ b/mk/mkc_imp.pkg-config.mk
|
|
2 |
@@ -42,8 +42,8 @@
|
|
3 |
${PROG.pkg-config} --libs "${_lp}"
|
|
4 |
.endif # LDADD.pkg-config.${l}
|
|
5 |
|
|
6 |
-MKC_CPPFLAGS += ${CPPFLAGS.pkg-config.${_ln}}
|
|
7 |
-MKC_LDADD += ${LDADD.pkg-config.${_ln}}
|
|
8 |
+MKC_CPPFLAGS := ${MKC_CPPFLAGS} ${CPPFLAGS.pkg-config.${_ln}}
|
|
9 |
+MKC_LDADD := ${MKC_LDADD} ${LDADD.pkg-config.${_ln}}
|
|
10 |
.endif # PROGS || LIB
|
|
11 |
|
|
12 |
.for i in ${PKG_CONFIG_VARS.${_ln}}
|
|
13 |
@@ -54,7 +54,7 @@
|
|
14 |
.endif # PKG_CONFIG.var.${_ln}.${i}
|
|
15 |
.endfor # i
|
|
16 |
|
|
17 |
-MKC_CFLAGS += -DHAVE_PKCONFIG_${_id:S/-/_/g:S/+/P/g:S/./_/g}=1
|
|
18 |
+MKC_CFLAGS := ${MKC_CFLAGS} -DHAVE_PKGCONFIG_${_id:S/-/_/g:S/+/P/g:S/./_/g}=1
|
|
19 |
|
|
20 |
.elif !empty(MKC_REQUIRE_PKGCONFIG:M${l})
|
|
21 |
MKC_ERR_MSG := ${MKC_ERR_MSG} "%%%: ${MKC_CACHEDIR}/_mkc_pkgconfig_${_ln}.err"
|
0 | 0 |
01-lua-mk.patch
|
|
1 |
01-pkgconfig.patch
|