diff --git a/disable-out-of-memory-test.patch b/disable-out-of-memory-test.patch deleted file mode 100644 index 657aa930e6cd441bf5f21eb7017380ff0452733a..0000000000000000000000000000000000000000 --- a/disable-out-of-memory-test.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/test-suite/standalone/test-out-of-memory b/test-suite/standalone/test-out-of-memory -index 95692d6..49988ce 100755 ---- a/test-suite/standalone/test-out-of-memory -+++ b/test-suite/standalone/test-out-of-memory -@@ -3,6 +3,8 @@ guild compile "$0" - exec guile -q -s "$0" "$@" - !# - -+(exit 77) -+ - (unless (defined? 'setrlimit) - ;; Without an rlimit, this test can take down your system, as it - ;; consumes all of your memory. That doesn't seem like something we diff --git a/guile-2.0.14-gc_pkgconfig_private.patch b/guile-2.0.14-gc_pkgconfig_private.patch deleted file mode 100644 index d8ee03197cbe3adebaba3a54027d120e86425b6d..0000000000000000000000000000000000000000 --- a/guile-2.0.14-gc_pkgconfig_private.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -up guile-2.2.7/meta/guile-2.2.pc.in.pkgconfig_private guile-2.2.7/meta/guile-2.2.pc.in ---- guile-2.2.7/meta/guile-2.2.pc.in.pkgconfig_private 2016-12-14 18:03:33.000000000 -0600 -+++ guile-2.0.7/meta/guile-2.2.pc.in 2018-02-20 11:53:56.344379283 -0600 -@@ -21,9 +21,9 @@ guile=${bindir}/@guile@ - Name: GNU Guile - Description: GNU's Ubiquitous Intelligent Language for Extension - Version: @GUILE_VERSION@ --Libs: -L${libdir} -lguile-@GUILE_EFFECTIVE_VERSION@ @BDW_GC_LIBS@ -+Libs: -L${libdir} -lguile-@GUILE_EFFECTIVE_VERSION@ - Libs.private: @LIB_CLOCK_GETTIME@ @LIBGMP@ @LIBLTDL@ @LIBFFI_LIBS@ \ - @LIBUNISTRING@ @GUILE_LIBS@ @LIBICONV@ @LIBINTL@ @LIBSOCKET@ \ - @SERVENT_LIB@ @HOSTENT_LIB@ @GETADDRINFO_LIB@ @INET_NTOP_LIB@ \ -- @INET_PTON_LIB@ -+ @INET_PTON_LIB@ @BDW_GC_LIBS@ - Cflags: -I${pkgincludedir}/@GUILE_EFFECTIVE_VERSION@ @GUILE_CFLAGS@ @BDW_GC_CFLAGS@ diff --git a/guile-2.2.7.tar.xz b/guile-3.0.10.tar.xz similarity index 35% rename from guile-2.2.7.tar.xz rename to guile-3.0.10.tar.xz index 49552e7624abe980cd89eb4d8bc7c6259b8f9cd3..2a0a1fb3530a1584c11a92ec326cb079c479cbd6 100644 Binary files a/guile-2.2.7.tar.xz and b/guile-3.0.10.tar.xz differ diff --git a/guile-configure.patch b/guile-configure.patch deleted file mode 100644 index e5b94368fcad419c9ea7e919b546e95e59acfe8f..0000000000000000000000000000000000000000 --- a/guile-configure.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -Nrup a/m4/mathfunc.m4 b/m4/mathfunc.m4 ---- a/m4/mathfunc.m4 2016-12-14 17:03:33.000000000 -0700 -+++ b/m4/mathfunc.m4 2020-01-06 19:48:46.684158282 -0700 -@@ -60,7 +60,7 @@ AC_DEFUN([gl_MATHFUNC], - #endif - #include - $4 -- $2 (*funcptr) $3 = ]func[; -+ __attribute__ ((used)) $2 (*funcptr) $3 = ]func[; - int i_ret; - float f_ret; - double d_ret; -@@ -85,7 +85,7 @@ AC_DEFUN([gl_MATHFUNC], - #endif - #include - $4 -- $2 (*funcptr) $3 = ]func[; -+ __attribute__ ((used)) $2 (*funcptr) $3 = ]func[; - int i_ret; - float f_ret; - double d_ret; diff --git a/guile-multilib.patch b/guile-multilib.patch deleted file mode 100644 index 4baf3098b5cf3ec38924e2da09de15e5bfddf4c4..0000000000000000000000000000000000000000 --- a/guile-multilib.patch +++ /dev/null @@ -1,47 +0,0 @@ -diff -up guile-2.0.9/libguile/Makefile.in.multilib guile-2.0.9/libguile/Makefile.in ---- guile-2.0.9/libguile/Makefile.in.multilib 2013-04-10 01:31:59.000000000 +0200 -+++ guile-2.0.9/libguile/Makefile.in 2013-07-16 16:59:59.490527131 +0200 -@@ -3283,6 +3283,11 @@ install-nodist_modincludeHEADERS: $(nodi - while read files; do \ - echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(modincludedir)'"; \ - $(INSTALL_HEADER) $$files "$(DESTDIR)$(modincludedir)" || exit $$?; \ -+ for f in $$files; do if [ "$$f" = "scmconfig.h" ]; then \ -+ grep -q "SCM_SIZEOF_LONG 4" "$(DESTDIR)$(modincludedir)/$$f" && g=32 || g=64; \ -+ mv "$(DESTDIR)$(modincludedir)/$$f" "$(DESTDIR)$(modincludedir)/scmconfig-$$g.h"; \ -+ $(INSTALL_HEADER) "$${d}scmconfig-multilib.h" "$(DESTDIR)$(modincludedir)/$$f"; \ -+ fi; done \ - done - - uninstall-nodist_modincludeHEADERS: -diff -up guile-2.0.9/libguile/scmconfig-multilib.h.multilib guile-2.0.9/libguile/scmconfig-multilib.h ---- guile-2.0.9/libguile/scmconfig-multilib.h.multilib 2013-07-16 17:02:26.045733704 +0200 -+++ guile-2.0.9/libguile/scmconfig-multilib.h 2013-07-16 17:01:51.623685971 +0200 -@@ -0,0 +1,7 @@ -+/* multilib clean wrapper */ -+#include -+#if __WORDSIZE == 32 -+#include "libguile/scmconfig-32.h" -+#else -+#include "libguile/scmconfig-64.h" -+#endif -diff -up guile-2.0.9/meta/guile-config.in.multilib guile-2.0.9/meta/guile-config.in ---- guile-2.0.9/meta/guile-config.in.multilib 2012-07-02 11:28:14.000000000 +0200 -+++ guile-2.0.9/meta/guile-config.in 2013-07-16 17:09:25.650324597 +0200 -@@ -1,7 +1,6 @@ - #!/bin/sh --PKG_CONFIG_PATH="@pkgconfigdir@:$PKG_CONFIG_PATH" - GUILE_AUTO_COMPILE=0 --export PKG_CONFIG_PATH GUILE_AUTO_COMPILE -+export GUILE_AUTO_COMPILE - - exec "@installed_guile@" -e main -s $0 "$@" - !# -@@ -31,7 +30,7 @@ exec "@installed_guile@" -e main -s $0 " - (ice-9 rdelim)) - - --(define %pkg-config-program "@PKG_CONFIG@") -+(define %pkg-config-program "pkg-config") - - ;;;; main function, command-line processing - diff --git a/guile-threadstest.patch b/guile-threadstest.patch deleted file mode 100644 index 969960157bde29b2e95c1a3165a4a66ef52e8436..0000000000000000000000000000000000000000 --- a/guile-threadstest.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/test-suite/tests/threads.test b/test-suite/tests/threads.test -index efdf36d..ff5ba2d 100644 ---- a/test-suite/tests/threads.test -+++ b/test-suite/tests/threads.test -@@ -382,6 +382,7 @@ - - (pass-if "mutex with owner not retained (bug #27450)" - (let ((g (make-guardian))) -+ (throw 'unresolved) - (g (let ((m (make-mutex))) (lock-mutex m) m)) - - ;; Avoid false references to M on the stack. diff --git a/guile.spec b/guile.spec index d675eb81cbefb9d27b2618ec73aebadbbfc15531..d62bcaa7d7124699d93ccff691b907fef0418542 100644 --- a/guile.spec +++ b/guile.spec @@ -1,28 +1,17 @@ Name: guile -Version: 2.2.7 -Release: 6 +Version: 3.0.10 +Release: 1 Epoch: 5 Summary: GNU's Ubiquitous Intelligent Language for Extension License: LGPLv3+ URL: https://www.gnu.org/software/guile/ Source: https://ftp.gnu.org/gnu/guile/%{name}-%{version}.tar.xz -%global g_version 2.2 - -#Patch from fedora -#https://src.fedoraproject.org/rpms/guile22/blob/f38/f/guile-multilb.patch -Patch1: guile-multilib.patch -#https://src.fedoraproject.org/rpms/guile22/blob/f38/f/guile-threadstest.patch -Patch3: guile-threadstest.patch -#https://src.fedoraproject.org/rpms/guile22/blob/f38/f/disable-out-of-memory-test.patch -Patch4: disable-out-of-memory-test.patch -#https://src.fedoraproject.org/rpms/guile22/blob/f38/f/guile-configure.patch -Patch5: guile-configure.patch -#https://src.fedoraproject.org/rpms/guile/blob/rawhide/f/guile-2.0.14-gc_pkgconfig_private.patch -Patch6000: guile-2.0.14-gc_pkgconfig_private.patch - -BuildRequires: gcc libtool gmp-devel readline-devel gc-devel libffi-devel -BuildRequires: gettext-devel libunistring-devel libtool-ltdl-devel +%global g_version 3.0 + +BuildRequires: gcc libtool automake libtool gmp-devel readline-devel gc-devel libffi-devel +BuildRequires: gettext-devel libunistring-devel libtool-ltdl-devel autoconf +BuildRequires: pkgconfig(bdw-gc) >= 7.2 pkgconfig(gmp) >= 4.1 pkgconfig(libffi) pkgconfig(readline) Requires: coreutils %description @@ -45,8 +34,7 @@ developing applications that use %{name}. %build autoreconf -fiv -%configure --disable-error-on-warning -sed -i 's|" $sys_lib_dlsearch_path "|" $sys_lib_dlsearch_path %{_libdir} "|' libtool +%configure --disable-static --disable-error-on-warning %make_build %install @@ -115,6 +103,9 @@ fi %{_mandir}/man1/guile.1.gz %changelog +* Mon Nov 11 2024 sqfu - 5:3.0.10-1 +- update version to 3.0.10 + * Mon Aug 19 2024 zhangpan - 5:2.2.7-6 - backport patch from upstream @@ -153,4 +144,4 @@ fi - DESC:remove the libguile-2.0.so.22.8.1-gdb.scm from package * Tue Sep 18 2019 openEuler Buildteam - 2.0.14-13 -- Package init +- Package init \ No newline at end of file