diff options
author | Ludovic Courtès <ludo@gnu.org> | 2015-09-13 21:28:01 +0200 |
---|---|---|
committer | Ludovic Courtès <ludo@gnu.org> | 2015-09-13 21:28:01 +0200 |
commit | 75710da66710cef1d32053cd8f350d13057d02a7 (patch) | |
tree | abef6a326c741b1eb18db866b2f2bacee3e5fc51 /gnu/packages/patches/guile-rsvg-pkgconfig.patch | |
parent | ab20c2cc33063ce783515d8ae7899ec7e2ca6f96 (diff) | |
parent | 610075f7c94c80b8321887b7ccf8bb1a7edd2b8e (diff) | |
download | guix-75710da66710cef1d32053cd8f350d13057d02a7.tar.gz |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/patches/guile-rsvg-pkgconfig.patch')
-rw-r--r-- | gnu/packages/patches/guile-rsvg-pkgconfig.patch | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/gnu/packages/patches/guile-rsvg-pkgconfig.patch b/gnu/packages/patches/guile-rsvg-pkgconfig.patch new file mode 100644 index 0000000000..2272b4e1cd --- /dev/null +++ b/gnu/packages/patches/guile-rsvg-pkgconfig.patch @@ -0,0 +1,16 @@ +This patch fixes a bug in guile-rsvg's build system, whereby the CFLAGS +and LDFLAGS for Guile would not be captured. + +--- guile-rsvg-2.18.1/configure.ac 2015-08-31 22:30:30.578909480 +0200 ++++ guile-rsvg-2.18.1/configure.ac 2015-08-31 22:32:15.071516084 +0200 +@@ -39,6 +39,10 @@ AC_SUBST(WARN_CFLAGS) + + GUILE_PKG([2.2 2.0 1.8]) + ++dnl The above macro fails to set the 'GUILE_CFLAGS' and 'GUILE_LIBS' ++dnl substitution variables, hence this line. ++PKG_CHECK_MODULES(GUILE, guile-2.0) ++ + PKG_CHECK_MODULES(GUILE_CAIRO, guile-cairo >= 1.4.0) + AC_SUBST(GUILE_CAIRO_LIBS) + AC_SUBST(GUILE_CAIRO_CFLAGS) |