diff options
| author | Andrew Shadura <andrewsh@debian.org> | 2014-03-16 15:29:25 +0100 |
|---|---|---|
| committer | Andrew Shadura <andrew@shadura.me> | 2015-07-25 14:44:44 +0200 |
| commit | 97598f790fc8cd838e57c8a0cd1c519bc81bceaa (patch) | |
| tree | a273a91ce0d6c31cac3bb94c8179afdab7c0864f /debian | |
| parent | e95ea4c40113360de58a71b7df0a1f8aa4e0cf21 (diff) | |
Imported Debian patch 0.26.0-2
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 6 | ||||
| -rw-r--r-- | debian/patches/01-pkgconfig.patch | 22 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
3 files changed, 29 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index c921076..66280d0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +mk-configure (0.26.0-2) unstable; urgency=low + + * Fix pkg-config checks (Closes: #741837). + + -- Andrew Shadura <andrewsh@debian.org> Sun, 16 Mar 2014 15:29:25 +0100 + mk-configure (0.26.0-1) unstable; urgency=low * New upstream release. diff --git a/debian/patches/01-pkgconfig.patch b/debian/patches/01-pkgconfig.patch new file mode 100644 index 0000000..a0624e9 --- /dev/null +++ b/debian/patches/01-pkgconfig.patch @@ -0,0 +1,22 @@ +--- a/mk/mkc_imp.pkg-config.mk ++++ b/mk/mkc_imp.pkg-config.mk +@@ -42,8 +42,8 @@ + ${PROG.pkg-config} --libs "${_lp}" + .endif # LDADD.pkg-config.${l} + +-MKC_CPPFLAGS += ${CPPFLAGS.pkg-config.${_ln}} +-MKC_LDADD += ${LDADD.pkg-config.${_ln}} ++MKC_CPPFLAGS := ${MKC_CPPFLAGS} ${CPPFLAGS.pkg-config.${_ln}} ++MKC_LDADD := ${MKC_LDADD} ${LDADD.pkg-config.${_ln}} + .endif # PROGS || LIB + + .for i in ${PKG_CONFIG_VARS.${_ln}} +@@ -54,7 +54,7 @@ + .endif # PKG_CONFIG.var.${_ln}.${i} + .endfor # i + +-MKC_CFLAGS += -DHAVE_PKCONFIG_${_id:S/-/_/g:S/+/P/g:S/./_/g}=1 ++MKC_CFLAGS := ${MKC_CFLAGS} -DHAVE_PKGCONFIG_${_id:S/-/_/g:S/+/P/g:S/./_/g}=1 + + .elif !empty(MKC_REQUIRE_PKGCONFIG:M${l}) + MKC_ERR_MSG := ${MKC_ERR_MSG} "%%%: ${MKC_CACHEDIR}/_mkc_pkgconfig_${_ln}.err" diff --git a/debian/patches/series b/debian/patches/series index b518ce1..42ca9bc 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,2 @@ 01-lua-mk.patch +01-pkgconfig.patch |