>From 9b9751b2961514a80740899e344e502d0aafd756 Mon Sep 17 00:00:00 2001 From: Knut Petersen Date: Wed, 6 Feb 2019 12:55:59 +0100 Subject: [PATCH] Test: Fix building of guile on ArchLinux --- gub/specs/guile.py | 10 +++++++--- patches/guile-fix-build-archlinux-linux-64.patch | 12 ++++++++++++ patches/guile-fix-build-archlinux-linux-x86.patch | 12 ++++++++++++ 3 files changed, 31 insertions(+), 3 deletions(-) create mode 100644 patches/guile-fix-build-archlinux-linux-64.patch create mode 100644 patches/guile-fix-build-archlinux-linux-x86.patch diff --git a/gub/specs/guile.py b/gub/specs/guile.py index 61b17ec4..0e16bc71 100644 --- a/gub/specs/guile.py +++ b/gub/specs/guile.py @@ -166,6 +166,13 @@ class Guile__linux (Guile): 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__64 (Guile__linux): + patches = Guile.patches + ['guile-fix-build-archlinux-linux-64.patch'] + +class Guile__linux__x86 (Guile__linux): + patches = Guile.patches + ['guile-1.8.6-pthreads-cross.patch', + 'guile-fix-build-archlinux-linux-x86.patch'] + class Guile__linux__ppc (Guile__linux): config_cache_overrides = Guile__linux.config_cache_overrides + ''' guile_cv_have_libc_stack_end=no @@ -194,9 +201,6 @@ class Guile__darwin (Guile): '%(srcdir)s/Makefile.in') Guile.configure (self) -class Guile__linux__x86 (Guile): - patches = Guile.patches + ['guile-1.8.6-pthreads-cross.patch'] - class Guile__tools (tools.AutoBuild, Guile): dependencies = (Guile.dependencies + ['autoconf', 'automake', 'gettext', 'flex', 'libtool']) diff --git a/patches/guile-fix-build-archlinux-linux-64.patch b/patches/guile-fix-build-archlinux-linux-64.patch new file mode 100644 index 00000000..481c3c25 --- /dev/null +++ b/patches/guile-fix-build-archlinux-linux-64.patch @@ -0,0 +1,12 @@ +diff -Naur guile-1.8.7/libguile/Makefile.in guilepatched/libguile/Makefile.in +--- guile-1.8.7/libguile/Makefile.in 2019-02-06 11:45:33.323913617 +0100 ++++ guilepatched/libguile/Makefile.in 2019-02-06 11:44:05.980786951 +0100 +@@ -676,7 +676,7 @@ + rm -f $$list + guile$(EXEEXT): $(guile_OBJECTS) $(guile_DEPENDENCIES) + @rm -f guile$(EXEEXT) +- $(guile_LINK) $(guile_OBJECTS) $(guile_LDADD) $(LIBS) ++ $(guile_LINK) $(guile_OBJECTS) $(guile_LDADD) $(LIBS) ../../../root/lib64/ld-linux-x86-64.so.2 + install-binSCRIPTS: $(bin_SCRIPTS) + @$(NORMAL_INSTALL) + test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" diff --git a/patches/guile-fix-build-archlinux-linux-x86.patch b/patches/guile-fix-build-archlinux-linux-x86.patch new file mode 100644 index 00000000..58d0d2d0 --- /dev/null +++ b/patches/guile-fix-build-archlinux-linux-x86.patch @@ -0,0 +1,12 @@ +diff -Naur guile-1.8.7/libguile/Makefile.in guilepatched/libguile/Makefile.in +--- guile-1.8.7/libguile/Makefile.in 2019-02-06 11:45:33.323913617 +0100 ++++ guilepatched/libguile/Makefile.in 2019-02-06 11:44:05.980786951 +0100 +@@ -676,7 +676,7 @@ + rm -f $$list + guile$(EXEEXT): $(guile_OBJECTS) $(guile_DEPENDENCIES) + @rm -f guile$(EXEEXT) +- $(guile_LINK) $(guile_OBJECTS) $(guile_LDADD) $(LIBS) ++ $(guile_LINK) $(guile_OBJECTS) $(guile_LDADD) $(LIBS) ../../../root/lib/ld-linux.so.2 + install-binSCRIPTS: $(bin_SCRIPTS) + @$(NORMAL_INSTALL) + test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" -- 2.20.1