From ab4faa53e532a02ae91f48389679bf12a543b31f Mon Sep 17 00:00:00 2001 From: Knut Petersen Date: Wed, 9 Jan 2019 13:58:17 +0100 Subject: [PATCH] Fix building of guile on openSuSE Tumbleweed and Ubuntu 18.04 Tested also on ubuntu 14.04, 16.04 and openSuSE Leap 42.3. Version 3, based on an analysis of Werner Lemberg, see https://lists.gnu.org/archive/html/lilypond-devel/2019-01/msg00042.html Signed-off-by: Knut Petersen --- gub/specs/guile.py | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/gub/specs/guile.py b/gub/specs/guile.py index 9f2ac0d1c..61b17ec42 100644 --- a/gub/specs/guile.py +++ b/gub/specs/guile.py @@ -35,14 +35,7 @@ class Guile (target.AutoBuild): C_INCLUDE_PATH= CPPFLAGS= LIBRARY_PATH= -PATH_SEPARATOR=':' -PATH=/usr/bin:$PATH -/usr/bin/cc --I%(builddir)s --I%(srcdir)s --I%(builddir)s/libguile --I. --I%(srcdir)s/libguile" +/usr/bin/cc" ''')) # FIXME: guile runs gen_scmconfig [when not x-building also guile] # without setting the proper LD_LIBRARY_PATH. @@ -170,7 +163,7 @@ def install (self): self.system ('''cd %(install_prefix)s/bin && cp guile.exe guile-windows.exe''') class Guile__linux (Guile): - compile_command = ('export LD_LIBRARY_PATH=%(builddir)s/libguile/.libs:$LD_LIBRARY_PATH;' + compile_command = ('export LD_LIBRARY_PATH=%(builddir)s/libguile/.libs:%(system_prefix)s/lib${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH};' + Guile.compile_command) class Guile__linux__ppc (Guile__linux):