开源软件构建与测试

_service:tar_scm:guile.spec Changed

@@ -1,16 +1,26 @@
 Name:          guile
-Version:       3.0.9
-Release:       1
+Version:       2.2.7
+Release:       2
 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 3.0
+%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
 
 BuildRequires: gcc libtool gmp-devel readline-devel gc-devel  libffi-devel
-BuildRequires: gettext-devel libunistring-devel  libtool-ltdl-devel guile
+BuildRequires: gettext-devel libunistring-devel  libtool-ltdl-devel
 Requires:      coreutils
 
 %description
@@ -55,8 +65,6 @@
 find %{buildroot}%{_datadir} -name '*.scm' -exec touch -r "%{_specdir}/guile.spec" '{}' \;
 find %{buildroot}%{_libdir} -name '*.go' -exec touch -r "%{_specdir}/guile.spec" '{}' \;
 
-cp -a %{_libdir}/libguile-2.0.so.22* %{buildroot}%{_libdir}
-
 %check
 make  check || true
 
@@ -83,10 +91,8 @@
 %{_bindir}/guile
 %{_bindir}/guile2*
 %{_bindir}/guile-tools
-%{_libdir}/guile/%{g_version}/ccache/*
-%{_libdir}/libguile-%{g_version}.so.*
-%{_libdir}/libguile-2.0.so.*
 %{_libdir}/guile
+%{_libdir}/libguile-%{g_version}.so.*
 %{_infodir}/guile.info*.gz
 %{_infodir}/r5rs.info.gz
 %ghost %{_datadir}/guile/site/%{g_version}/slibcat
@@ -106,8 +112,11 @@
 %{_mandir}/man1/guile.1.gz
 
 %changelog
-* Wed Feb 08 2023 zhouwenpei <zhouwenpei1@h-partners.com> - 3.0.9-1
-- update to 3.0.9
+* Mon Feb 20 2023 zhouwenpei <zhouwenpei1@h-partners.com> - 2.2.7-2
+- delete old so files
+
+* Mon Feb 13 2023 zhouwenpei <zhouwenpei1@h-partners.com> - 2.2.7-1
+- upgrade to 2.2.7
 
 * Mon Apr 25 2022 yangcheng <yangcheng87@h-partners.com> - 2.0.14-18
 - Remove multithreaded builds to resolve binary bep differences

_service:tar_scm:disable-out-of-memory-test.patch Added

_service:tar_scm:guile-configure.patch Added

_service:tar_scm:guile-multilib.patch Added

@@ -0,0 +1,47 @@
+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 <bits/wordsize.h>
++#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))
+ 
+ &#xc;
+-(define %pkg-config-program "@PKG_CONFIG@")
++(define %pkg-config-program "pkg-config")
+ 
+ ;;;; main function, command-line processing
+

_service:tar_scm:guile-threadstest.patch Added

_service:tar_scm:guile-3.0.9.tar.xz -> _service:tar_scm:guile-2.2.7.tar.xz Changed

Changes of Revision 2