!33 backport patch from upstream

From: @zppzhangpan 
Reviewed-by: @yanan-rock 
Signed-off-by: @yanan-rock
This commit is contained in:
openeuler-ci-bot 2024-08-19 08:35:02 +00:00 committed by Gitee
commit f85b942746
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 21 additions and 1 deletions

View File

@ -0,0 +1,15 @@
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@

View File

@ -1,6 +1,6 @@
Name: guile Name: guile
Version: 2.2.7 Version: 2.2.7
Release: 5 Release: 6
Epoch: 5 Epoch: 5
Summary: GNU's Ubiquitous Intelligent Language for Extension Summary: GNU's Ubiquitous Intelligent Language for Extension
License: LGPLv3+ License: LGPLv3+
@ -18,6 +18,8 @@ Patch3: guile-threadstest.patch
Patch4: 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 #https://src.fedoraproject.org/rpms/guile22/blob/f38/f/guile-configure.patch
Patch5: 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: gcc libtool gmp-devel readline-devel gc-devel libffi-devel
BuildRequires: gettext-devel libunistring-devel libtool-ltdl-devel BuildRequires: gettext-devel libunistring-devel libtool-ltdl-devel
@ -113,6 +115,9 @@ fi
%{_mandir}/man1/guile.1.gz %{_mandir}/man1/guile.1.gz
%changelog %changelog
* Mon Aug 19 2024 zhangpan <zhangpan103@h-partners.com> - 5:2.2.7-6
- backport patch from upstream
* Fri Jul 19 2024 liweigang <liweiganga@uniontech.com> - 5:2.2.7-5 * Fri Jul 19 2024 liweigang <liweiganga@uniontech.com> - 5:2.2.7-5
- fix build error(automake 1.17) - fix build error(automake 1.17)
- regenerate configure file - regenerate configure file