From: Anthony Fok Date: Sun, 29 Jan 2017 07:27:41 +0000 (-0700) Subject: Use real guile binary instead of libtool wrapper in guile-config X-Git-Tag: debian/2.18.2-9~13 X-Git-Url: https://git.donarmstrong.com/lilypond.git?a=commitdiff_plain;h=77831141fb83d0a046b0c78f06f8e58bef19ee68;p=lilypond.git Use real guile binary instead of libtool wrapper in guile-config Fix FTBFS (introduced by me in 2.18.2-5) on kfreebsd-{amd64,i386}. --- diff --git a/debian/patches/0100-guile-config-link-static-libguile.a-for-lilypond.patch b/debian/patches/0100-guile-config-link-static-libguile.a-for-lilypond.patch index 86e5227132..b0f2a6557c 100644 --- a/debian/patches/0100-guile-config-link-static-libguile.a-for-lilypond.patch +++ b/debian/patches/0100-guile-config-link-static-libguile.a-for-lilypond.patch @@ -7,7 +7,7 @@ Author: Anthony Fok Origin: vendor Bug-Debian: https://bugs.debian.org/746005 Forwarded: not-needed -Last-Update: 2017-01-23 +Last-Update: 2017-01-29 --- This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ --- a/guile18/guile-config/guile-config.in @@ -36,7 +36,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ rm -f guile-config.tmp sed < ${srcdir}/guile-config.in > guile-config.tmp \ - -e 's|@-bindir-@|${bindir}|' \ -+ -e 's|@-bindir-@|${abs_top_builddir}/libguile|' \ ++ -e 's|@-bindir-@|$(dir ${abs_top_builddir})out/guile${bindir}|' \ -e s:@-GUILE_VERSION-@:${GUILE_VERSION}: chmod +x guile-config.tmp mv guile-config.tmp guile-config