Hi everybody!
Version 2 of the patch to fix building xxx::guile with gub.
rm -rf target/*/packages/*guile*
bin/gub tools::guile freebsd-64::guile linux-ppc::guile darwin-x86::guile
darwin-ppc::guile mingw::guile freebsd-x86::guile linux-x86::guile
linux-64::guile
now succeeds on ubuntu 14, ubuntu 16, ubuntu 18 and openSuSE Tumbleweed (cpu
used: i7-4790K).
Please test.
Knut
>From 6f5338f4385d288177b384d2f6f7cf47324d21d8 Mon Sep 17 00:00:00 2001
From: Knut Petersen <knut_peter...@t-online.de>
Date: Wed, 9 Jan 2019 13:58:17 +0100
Subject: [PATCH] Fix building of guile on openSuSE Tumbleweed
Version 2:
- also fixes building guile on Ubuntu 18.04
- tested on Ubuntu 16.04
- tested on Ubuntu 18.04
- tested on Ubuntu 14.04
Signed-off-by: Knut Petersen <knut_peter...@t-online.de>
---
gub/specs/guile.py | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/gub/specs/guile.py b/gub/specs/guile.py
index 9f2ac0d1..6703929b 100644
--- a/gub/specs/guile.py
+++ b/gub/specs/guile.py
@@ -15,7 +15,7 @@ class Guile (target.AutoBuild):
'guile-cexp.patch',
'guile-1.8.6-test-use-srfi.patch',
'guile-1.8.7-doc-snarfing.patch']
- dependencies = ['gettext-devel', 'gmp-devel', 'libtool', 'tools::guile']
+ dependencies = ['gettext-devel', 'gmp-devel', 'libtool', 'tools::guile', 'linux-x86::cross/gcc']
guile_configure_flags = misc.join_lines ('''
--without-threads
--with-gnu-ld
@@ -35,9 +35,7 @@ LD_PRELOAD=
C_INCLUDE_PATH=
CPPFLAGS=
LIBRARY_PATH=
-PATH_SEPARATOR=':'
-PATH=/usr/bin:$PATH
-/usr/bin/cc
+%(alltargetdir)s/linux-x86/root/usr/cross/bin/i686-linux-gcc
-I%(builddir)s
-I%(srcdir)s
-I%(builddir)s/libguile
@@ -170,7 +168,7 @@ libltdl_cv_sys_search_path=${libltdl_cv_sys_search_path="%(system_prefix)s/lib"}
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):
--
2.20.1
_______________________________________________
lilypond-devel mailing list
lilypond-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/lilypond-devel
