From 4aa8a8f2932c4a1c6896142fc839d5c3116838fc8853f3169ef5d1d7316a382d Mon Sep 17 00:00:00 2001 From: Petr Gajdos Date: Tue, 26 Jan 2010 18:31:55 +0000 Subject: [PATCH 1/4] - fixed build: "Earlier versions of ltdl would look for extensions under $PWD; this behavior changed in 2.2.6b." OBS-URL: https://build.opensuse.org/package/show/devel:languages:misc/guile?expand=0&rev=6 --- guile-testsuite-build.patch | 33 +++++++++++++++++++++++++++++++++ guile.changes | 8 ++++++++ guile.spec | 2 ++ 3 files changed, 43 insertions(+) create mode 100644 guile-testsuite-build.patch diff --git a/guile-testsuite-build.patch b/guile-testsuite-build.patch new file mode 100644 index 0000000..77559f9 --- /dev/null +++ b/guile-testsuite-build.patch @@ -0,0 +1,33 @@ +Index: guile-1.8.7/test-suite/standalone/Makefile.am +=================================================================== +--- guile-1.8.7.orig/test-suite/standalone/Makefile.am ++++ guile-1.8.7/test-suite/standalone/Makefile.am +@@ -28,7 +28,7 @@ check_SCRIPTS = + BUILT_SOURCES = + EXTRA_DIST = + +-TESTS_ENVIRONMENT = "${top_builddir}/pre-inst-guile-env" ++TESTS_ENVIRONMENT = builddir="$(builddir)" "${top_builddir}/pre-inst-guile-env" + + test_cflags = \ + -I$(top_srcdir)/test-suite/standalone \ +Index: guile-1.8.7/test-suite/standalone/test-asmobs +=================================================================== +--- guile-1.8.7.orig/test-suite/standalone/test-asmobs ++++ guile-1.8.7/test-suite/standalone/test-asmobs +@@ -2,7 +2,7 @@ + exec guile -q -s "$0" "$@" + !# + +-(load-extension "libtest-asmobs" "libtest_asmobs_init") ++(load-extension (string-append (getenv "builddir") "/libtest-asmobs") "libtest_asmobs_init") + + (define (test x v) + (if v +@@ -114,4 +114,4 @@ exec guile -q -s "$0" "$@" + + ;; Local Variables: + ;; mode: scheme +-;; End: +\ No newline at end of file ++;; End: diff --git a/guile.changes b/guile.changes index 0bb1dc1..af2a07f 100644 --- a/guile.changes +++ b/guile.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Tue Jan 26 19:26:58 CET 2010 - pgajdos@suse.cz + +- fixed build: + + "Earlier versions of ltdl would look for extensions under $PWD; this + behavior changed in 2.2.6b." + ------------------------------------------------------------------- Mon Nov 30 17:49:57 CET 2009 - pgajdos@suse.cz diff --git a/guile.spec b/guile.spec index 03a0799..c2acde1 100644 --- a/guile.spec +++ b/guile.spec @@ -30,6 +30,7 @@ Source0: %{name}-%{version}.tar.bz2 Patch1: %{name}-64bit.patch Patch2: %{name}-1.6.10-mktemp.patch Patch3: %{name}-popen-test.patch +Patch4: %{name}-testsuite-build.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: fileutils sh-utils PreReq: %install_info_prereq @@ -88,6 +89,7 @@ Authors: %patch1 %patch2 %patch3 -p1 +%patch4 -p1 # guile-1.8.1: The code is not so good for -Werror (unused results of write()). sed -i s/-Werror// configure.in configure # force rebuild with non-broken makeinfo From 9c2e3f6ae61a91825091c2c46405e9a89a230f236a25149f8d01ccae40a4b909 Mon Sep 17 00:00:00 2001 From: Petr Gajdos Date: Tue, 26 Jan 2010 18:44:03 +0000 Subject: [PATCH 2/4] * testsuite-build.patch taken from guile git (1.8 branch) OBS-URL: https://build.opensuse.org/package/show/devel:languages:misc/guile?expand=0&rev=7 --- guile.changes | 2 ++ 1 file changed, 2 insertions(+) diff --git a/guile.changes b/guile.changes index af2a07f..73dc7c9 100644 --- a/guile.changes +++ b/guile.changes @@ -6,6 +6,8 @@ Tue Jan 26 19:26:58 CET 2010 - pgajdos@suse.cz "Earlier versions of ltdl would look for extensions under $PWD; this behavior changed in 2.2.6b." + * testsuite-build.patch taken from guile git (1.8 branch) + ------------------------------------------------------------------- Mon Nov 30 17:49:57 CET 2009 - pgajdos@suse.cz From df53e2b5afca902d30a1bf88db789d41cdb5f14abc8477bf51a6b9695e2ec76d Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Wed, 27 Jan 2010 16:50:43 +0000 Subject: [PATCH 3/4] checked in (request 30518) OBS-URL: https://build.opensuse.org/package/show/devel:languages:misc/guile?expand=0&rev=8 --- guile-testsuite-build.patch | 33 --------------------------------- guile.changes | 10 ---------- guile.spec | 2 -- 3 files changed, 45 deletions(-) delete mode 100644 guile-testsuite-build.patch diff --git a/guile-testsuite-build.patch b/guile-testsuite-build.patch deleted file mode 100644 index 77559f9..0000000 --- a/guile-testsuite-build.patch +++ /dev/null @@ -1,33 +0,0 @@ -Index: guile-1.8.7/test-suite/standalone/Makefile.am -=================================================================== ---- guile-1.8.7.orig/test-suite/standalone/Makefile.am -+++ guile-1.8.7/test-suite/standalone/Makefile.am -@@ -28,7 +28,7 @@ check_SCRIPTS = - BUILT_SOURCES = - EXTRA_DIST = - --TESTS_ENVIRONMENT = "${top_builddir}/pre-inst-guile-env" -+TESTS_ENVIRONMENT = builddir="$(builddir)" "${top_builddir}/pre-inst-guile-env" - - test_cflags = \ - -I$(top_srcdir)/test-suite/standalone \ -Index: guile-1.8.7/test-suite/standalone/test-asmobs -=================================================================== ---- guile-1.8.7.orig/test-suite/standalone/test-asmobs -+++ guile-1.8.7/test-suite/standalone/test-asmobs -@@ -2,7 +2,7 @@ - exec guile -q -s "$0" "$@" - !# - --(load-extension "libtest-asmobs" "libtest_asmobs_init") -+(load-extension (string-append (getenv "builddir") "/libtest-asmobs") "libtest_asmobs_init") - - (define (test x v) - (if v -@@ -114,4 +114,4 @@ exec guile -q -s "$0" "$@" - - ;; Local Variables: - ;; mode: scheme --;; End: -\ No newline at end of file -+;; End: diff --git a/guile.changes b/guile.changes index 73dc7c9..0bb1dc1 100644 --- a/guile.changes +++ b/guile.changes @@ -1,13 +1,3 @@ -------------------------------------------------------------------- -Tue Jan 26 19:26:58 CET 2010 - pgajdos@suse.cz - -- fixed build: - - "Earlier versions of ltdl would look for extensions under $PWD; this - behavior changed in 2.2.6b." - - * testsuite-build.patch taken from guile git (1.8 branch) - ------------------------------------------------------------------- Mon Nov 30 17:49:57 CET 2009 - pgajdos@suse.cz diff --git a/guile.spec b/guile.spec index c2acde1..03a0799 100644 --- a/guile.spec +++ b/guile.spec @@ -30,7 +30,6 @@ Source0: %{name}-%{version}.tar.bz2 Patch1: %{name}-64bit.patch Patch2: %{name}-1.6.10-mktemp.patch Patch3: %{name}-popen-test.patch -Patch4: %{name}-testsuite-build.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: fileutils sh-utils PreReq: %install_info_prereq @@ -89,7 +88,6 @@ Authors: %patch1 %patch2 %patch3 -p1 -%patch4 -p1 # guile-1.8.1: The code is not so good for -Werror (unused results of write()). sed -i s/-Werror// configure.in configure # force rebuild with non-broken makeinfo From 28181f98ea0c4b3051372fe59a067921b7caf86982b8bf05b4aff9236ec36a58 Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Wed, 27 Jan 2010 16:50:44 +0000 Subject: [PATCH 4/4] Updating link to change in openSUSE:Factory/guile revision 15.0 OBS-URL: https://build.opensuse.org/package/show/devel:languages:misc/guile?expand=0&rev=d8b0181b619c95cb23602fea84bf5f51 --- guile-testsuite-build.patch | 33 +++++++++++++++++++++++++++++++++ guile.changes | 10 ++++++++++ guile.spec | 6 ++++-- 3 files changed, 47 insertions(+), 2 deletions(-) create mode 100644 guile-testsuite-build.patch diff --git a/guile-testsuite-build.patch b/guile-testsuite-build.patch new file mode 100644 index 0000000..77559f9 --- /dev/null +++ b/guile-testsuite-build.patch @@ -0,0 +1,33 @@ +Index: guile-1.8.7/test-suite/standalone/Makefile.am +=================================================================== +--- guile-1.8.7.orig/test-suite/standalone/Makefile.am ++++ guile-1.8.7/test-suite/standalone/Makefile.am +@@ -28,7 +28,7 @@ check_SCRIPTS = + BUILT_SOURCES = + EXTRA_DIST = + +-TESTS_ENVIRONMENT = "${top_builddir}/pre-inst-guile-env" ++TESTS_ENVIRONMENT = builddir="$(builddir)" "${top_builddir}/pre-inst-guile-env" + + test_cflags = \ + -I$(top_srcdir)/test-suite/standalone \ +Index: guile-1.8.7/test-suite/standalone/test-asmobs +=================================================================== +--- guile-1.8.7.orig/test-suite/standalone/test-asmobs ++++ guile-1.8.7/test-suite/standalone/test-asmobs +@@ -2,7 +2,7 @@ + exec guile -q -s "$0" "$@" + !# + +-(load-extension "libtest-asmobs" "libtest_asmobs_init") ++(load-extension (string-append (getenv "builddir") "/libtest-asmobs") "libtest_asmobs_init") + + (define (test x v) + (if v +@@ -114,4 +114,4 @@ exec guile -q -s "$0" "$@" + + ;; Local Variables: + ;; mode: scheme +-;; End: +\ No newline at end of file ++;; End: diff --git a/guile.changes b/guile.changes index 0bb1dc1..73dc7c9 100644 --- a/guile.changes +++ b/guile.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Tue Jan 26 19:26:58 CET 2010 - pgajdos@suse.cz + +- fixed build: + + "Earlier versions of ltdl would look for extensions under $PWD; this + behavior changed in 2.2.6b." + + * testsuite-build.patch taken from guile git (1.8 branch) + ------------------------------------------------------------------- Mon Nov 30 17:49:57 CET 2009 - pgajdos@suse.cz diff --git a/guile.spec b/guile.spec index 03a0799..640d11b 100644 --- a/guile.spec +++ b/guile.spec @@ -1,7 +1,7 @@ # # spec file for package guile (Version 1.8.7) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -23,13 +23,14 @@ License: LGPLv2.1+ Group: Development/Languages/Scheme AutoReqProv: on Version: 1.8.7 -Release: 1 +Release: 2 Summary: GNU's Ubiquitous Intelligent Language for Extension Url: http://www.gnu.org/software/guile/ Source0: %{name}-%{version}.tar.bz2 Patch1: %{name}-64bit.patch Patch2: %{name}-1.6.10-mktemp.patch Patch3: %{name}-popen-test.patch +Patch4: %{name}-testsuite-build.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: fileutils sh-utils PreReq: %install_info_prereq @@ -88,6 +89,7 @@ Authors: %patch1 %patch2 %patch3 -p1 +%patch4 -p1 # guile-1.8.1: The code is not so good for -Werror (unused results of write()). sed -i s/-Werror// configure.in configure # force rebuild with non-broken makeinfo