]> git.donarmstrong.com Git - lilypond.git/blob - debian/patches/0100-guile-config-link-static-libguile.a-for-lilypond.patch
Cherry-pick 6a73776004 with minor adaptions in d/control and d/rules
[lilypond.git] / debian / patches / 0100-guile-config-link-static-libguile.a-for-lilypond.patch
1 Description: Tweak guile-config to link with static libguile.a
2  This patch allows LilyPond to be built with an embedded static library
3  of guile-1.8 for Debian 9 "stretch" due to the removal of guile-1.8
4  from Debian and the incompatibility between the current LilyPond and
5  Guile 2.
6 Author: Anthony Fok <foka@debian.org>
7 Origin: vendor
8 Bug-Debian: https://bugs.debian.org/746005
9 Forwarded: not-needed
10 Last-Update: 2017-01-23
11 ---
12 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
13 --- a/guile18/guile-config/guile-config.in
14 +++ b/guile18/guile-config/guile-config.in
15 @@ -155,6 +155,7 @@
16                         (string=? libdir "/usr/lib/"))
17                    ""
18                    (string-append "-L" (get-build-info 'libdir)))
19 +                  (string-append "-L" (getcwd) "/guile18/libguile/.libs")
20                 "-lguile -lltdl"
21                (string-join other-flags)
22  
23 @@ -191,7 +192,7 @@
24      (if (not (string=? (get-build-info 'includedir) "/usr/include"))
25          (string-append "-I" (get-build-info 'includedir) " ")
26          " ")
27 -    
28 +    (string-append "-I" (getcwd) "/guile18" " ")
29      (get-build-info 'CFLAGS)
30      "\n"
31      )))
32 --- a/guile18/guile-config/Makefile.am
33 +++ b/guile18/guile-config/Makefile.am
34 @@ -35,7 +35,7 @@
35  guile-config: guile-config.in ${top_builddir}/libguile/libpath.h
36         rm -f guile-config.tmp
37         sed < ${srcdir}/guile-config.in > guile-config.tmp \
38 -           -e 's|@-bindir-@|${bindir}|' \
39 +           -e 's|@-bindir-@|${abs_top_builddir}/libguile|' \
40             -e s:@-GUILE_VERSION-@:${GUILE_VERSION}:
41         chmod +x guile-config.tmp
42         mv guile-config.tmp guile-config