Compare commits
13 Commits
Author | SHA1 | Date |
---|---|---|
Fedora Release Engineering | 559062c594 | |
Tomas Korbar | 2ad11e3794 | |
Fedora Release Engineering | 30ebdfd9d2 | |
Miro Hrončok | 770e76a405 | |
Fedora Release Engineering | 8ca8f34913 | |
Fedora Release Engineering | e28de64644 | |
Tomas Korbar | 19b603122e | |
Tom Stellard | 6fcb92e08a | |
Tomas Korbar | 0db5bc188e | |
Fedora Release Engineering | 4d71c6d712 | |
Tomas Korbar | c49a979391 | |
Fedora Release Engineering | 38319013d8 | |
Jeff Law | 97af2cf21f |
|
@ -0,0 +1,21 @@
|
|||
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 <math.h>
|
||||
$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 <math.h>
|
||||
$4
|
||||
- $2 (*funcptr) $3 = ]func[;
|
||||
+ __attribute__ ((used)) $2 (*funcptr) $3 = ]func[;
|
||||
int i_ret;
|
||||
float f_ret;
|
||||
double d_ret;
|
|
@ -1,32 +1,52 @@
|
|||
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
|
||||
commit 23eafdbac3bcb1116205a9ef51f0bd301c966483
|
||||
Author: Tomas Korbar <tkorbar@redhat.com>
|
||||
Date: Mon Jan 25 10:04:19 2021 +0100
|
||||
|
||||
Fix multilib
|
||||
|
||||
diff --git a/libguile/Makefile.am b/libguile/Makefile.am
|
||||
index 74894e1..2ee2ef5 100644
|
||||
--- a/libguile/Makefile.am
|
||||
+++ b/libguile/Makefile.am
|
||||
@@ -84,7 +84,10 @@ scmconfig.h: ${top_builddir}/config.h gen-scmconfig$(EXEEXT)
|
||||
./gen-scmconfig$(EXEEXT) >> scmconfig.h.tmp; \
|
||||
chmod 444 scmconfig.h.tmp; \
|
||||
rm -f scmconfig.h; \
|
||||
- mv scmconfig.h.tmp scmconfig.h)
|
||||
+ mv scmconfig.h.tmp scmconfig.h; \
|
||||
+ grep -q "SCM_SIZEOF_LONG 4" ./scmconfig.h && g=32 || g=64; \
|
||||
+ mv scmconfig.h scmconfig-$$g.h;\
|
||||
+ cp scmconfig-multilib.h scmconfig.h)
|
||||
|
||||
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
|
||||
|
||||
guile_filter_doc_snarfage_SOURCES = c-tokenize.c
|
||||
@@ -661,7 +664,8 @@ modinclude_HEADERS = \
|
||||
vm-expand.h \
|
||||
vm.h \
|
||||
vports.h \
|
||||
- weaks.h
|
||||
+ weaks.h \
|
||||
+ scmconfig-[0-9][0-9].h
|
||||
|
||||
nodist_modinclude_HEADERS = version.h scmconfig.h
|
||||
|
||||
diff --git a/libguile/scmconfig-multilib.h b/libguile/scmconfig-multilib.h
|
||||
new file mode 100644
|
||||
index 0000000..d7f96a2
|
||||
--- /dev/null
|
||||
+++ b/libguile/scmconfig-multilib.h
|
||||
@@ -0,0 +1,7 @@
|
||||
+/* multilib clean wrapper */
|
||||
+#include <bits/wordsize.h>
|
||||
+#if __WORDSIZE == 32
|
||||
+#include "libguile/scmconfig-32.h"
|
||||
+#include "scmconfig-32.h"
|
||||
+#else
|
||||
+#include "libguile/scmconfig-64.h"
|
||||
+#include "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
|
||||
diff --git a/meta/guile-config.in b/meta/guile-config.in
|
||||
index 0226f68..5a6effc 100755
|
||||
--- a/meta/guile-config.in
|
||||
+++ b/meta/guile-config.in
|
||||
@@ -1,7 +1,6 @@
|
||||
#!/bin/sh
|
||||
-PKG_CONFIG_PATH="@pkgconfigdir@:$PKG_CONFIG_PATH"
|
||||
|
@ -36,7 +56,7 @@ diff -up guile-2.0.9/meta/guile-config.in.multilib guile-2.0.9/meta/guile-config
|
|||
|
||||
exec "@installed_guile@" -e main -s $0 "$@"
|
||||
!#
|
||||
@@ -31,7 +30,7 @@ exec "@installed_guile@" -e main -s $0 "
|
||||
@@ -31,7 +30,7 @@ exec "@installed_guile@" -e main -s $0 "$@"
|
||||
(ice-9 rdelim))
|
||||
|
||||
|
||||
|
|
49
guile.spec
49
guile.spec
|
@ -2,13 +2,14 @@ Summary: A GNU implementation of Scheme for application extensibility
|
|||
Name: guile
|
||||
%define mver 2.0
|
||||
Version: 2.0.14
|
||||
Release: 17%{?dist}
|
||||
Release: 29%{?dist}
|
||||
Epoch: 5
|
||||
Source: ftp://ftp.gnu.org/pub/gnu/guile/guile-%{version}.tar.xz
|
||||
URL: http://www.gnu.org/software/guile/
|
||||
License: LGPLv3+
|
||||
BuildRequires: gcc libtool libtool-ltdl-devel gmp-devel readline-devel
|
||||
BuildRequires: gettext-devel libunistring-devel libffi-devel gc-devel
|
||||
BuildRequires: make
|
||||
Requires: coreutils
|
||||
|
||||
Patch1: guile-multilib.patch
|
||||
|
@ -18,6 +19,7 @@ Patch3: guile-threadstest.patch
|
|||
# TODO: consider using: Requires.private: bdw-gc
|
||||
Patch4: guile-2.0.14-gc_pkgconfig_private.patch
|
||||
Patch5: guile-ieeetest.patch
|
||||
Patch6: guile-configure.patch
|
||||
|
||||
%description
|
||||
GUILE (GNU's Ubiquitous Intelligent Language for Extension) is a library
|
||||
|
@ -51,8 +53,10 @@ install the guile package.
|
|||
%ifarch ppc64le
|
||||
%patch5 -p1 -b .ieeetest
|
||||
%endif
|
||||
%patch6 -p1 -b .configure
|
||||
|
||||
%build
|
||||
autoreconf -fiv
|
||||
|
||||
# The -O2 option in CFLAGS seems to cause the build to fail on
|
||||
# some archs (bug #1675089)
|
||||
|
@ -90,6 +94,7 @@ touch $RPM_BUILD_ROOT%{_datadir}/guile/site/%{mver}/slibcat
|
|||
|
||||
# Create symlinks for compatibility
|
||||
ln -s guile $RPM_BUILD_ROOT%{_bindir}/guile2
|
||||
ln -s %{_mandir}/man1/guile.1.gz $RPM_BUILD_ROOT%{_mandir}/man1/guile2.1.gz
|
||||
ln -s guile-tools $RPM_BUILD_ROOT%{_bindir}/guile2-tools
|
||||
|
||||
# Adjust mtimes so they are all identical on all architectures.
|
||||
|
@ -104,7 +109,7 @@ find $RPM_BUILD_ROOT%{_datadir} -name '*.scm' -exec touch -r "%{_specdir}/guile.
|
|||
find $RPM_BUILD_ROOT%{_libdir} -name '*.go' -exec touch -r "%{_specdir}/guile.spec" '{}' \;
|
||||
|
||||
%check
|
||||
make %{?_smp_mflags} check
|
||||
%make_build check
|
||||
|
||||
%ldconfig_scriptlets
|
||||
|
||||
|
@ -153,6 +158,7 @@ fi
|
|||
%ghost %{_datadir}/guile/site/%{mver}/slibcat
|
||||
%{_infodir}/*
|
||||
%{_mandir}/man1/guile.1*
|
||||
%{_mandir}/man1/guile2.1*
|
||||
|
||||
%files devel
|
||||
%{_bindir}/guile-config
|
||||
|
@ -163,6 +169,45 @@ fi
|
|||
%{_includedir}/guile
|
||||
|
||||
%changelog
|
||||
* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 5:2.0.14-29
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
|
||||
|
||||
* Mon Jan 31 2022 Tomas Korbar <tkorbar@redhat.com> - 5:2.0.14-28
|
||||
- Rebuild because of rhbz#2045694
|
||||
- Resolves: rhbz#2045694
|
||||
|
||||
* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 5:2.0.14-27
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
|
||||
|
||||
* Sat Jan 08 2022 Miro Hrončok <mhroncok@redhat.com> - 5:2.0.14-26
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Changes/LIBFFI34
|
||||
|
||||
* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 5:2.0.14-25
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
|
||||
|
||||
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 5:2.0.14-24
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
||||
|
||||
* Mon Jan 25 2021 Tomas Korbar <tkorbar@redhat.com> - 5:2.0.14-23
|
||||
- Allow guile-devel x86_64 and i686 to be installed at the same time
|
||||
- Resolves: rhbz#1915345
|
||||
|
||||
* Thu Aug 13 2020 Tomas Korbar <tkorbar@redhat.com> - 5:2.0.14-22
|
||||
- Use make macros
|
||||
- https://fedoraproject.org/wiki/Changes/UseMakeBuildInstallMacro
|
||||
|
||||
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 5:2.0.14-21
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||
|
||||
* Tue May 26 2020 Tomas Korbar <tkorbar@redhat.com> - 5:2.0.14-20
|
||||
- Create symlink for guile2 manpage (#1612696)
|
||||
|
||||
* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 5:2.0.14-19
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
||||
|
||||
* Fri Jan 17 2020 Jeff Law <law@redhat.com> - 5:2.0.14-18
|
||||
- Fix configure tests compromised by LTO
|
||||
|
||||
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 5:2.0.14-17
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
||||
|
||||
|
|
Loading…
Reference in New Issue