Compare commits
21 Commits
master
...
main-riscv
Author | SHA1 | Date |
---|---|---|
David Abdurachmanov | 1cf6e99629 | |
Fedora Release Engineering | b0c179f2a6 | |
Tomas Korbar | 5653133f0c | |
Tomas Korbar | 40cfdea9fd | |
Fedora Release Engineering | e1794e56c7 | |
Florian Weimer | 7fcab121be | |
David Abdurachmanov | 8f694b3142 | |
David Abdurachmanov | ab4b4fa798 | |
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,71 @@
|
|||
These issues have already been fixed upstream via gnulib imports:
|
||||
|
||||
commit 7e641595cd9b45ce7339e21c20a8ab81af9278f6
|
||||
Author: Andy Wingo <wingo@pobox.com>
|
||||
Date: Wed Feb 15 21:41:24 2017 +0100
|
||||
|
||||
Update Gnulib to v0.1-1157-gb03f418.
|
||||
|
||||
commit a91b95cca2d397c84f8b9bbd602d40209a7092ce
|
||||
Author: Andy Wingo <wingo@pobox.com>
|
||||
Date: Wed Jan 20 21:52:54 2021 +0100
|
||||
|
||||
Update Gnulib to v0.1-4379-g2ef5a9b4b
|
||||
|
||||
Also bump required autoconf version to 2.64, as required by Gnulib.
|
||||
|
||||
diff --git a/configure b/configure
|
||||
index 4e7d6f1670f53037..e2816d1ead4b34ba 100755
|
||||
--- a/configure
|
||||
+++ b/configure
|
||||
@@ -16222,7 +16222,7 @@ int main()
|
||||
* (double) (1U << ((DBL_MANT_DIG + 3) / 5))
|
||||
* (double) (1U << ((DBL_MANT_DIG + 4) / 5));
|
||||
volatile double x = 0.5 - 0.5 / TWO_MANT_DIG;
|
||||
- exit (x < 0.5 && round (x) != 0.0);
|
||||
+ return x < 0.5 && round (x) != 0.0;
|
||||
}
|
||||
_ACEOF
|
||||
if ac_fn_c_try_run "$LINENO"; then :
|
||||
@@ -26029,6 +26029,7 @@ else
|
||||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||
/* end confdefs.h. */
|
||||
#include <unistd.h>
|
||||
+#include <stdio.h>
|
||||
|
||||
int
|
||||
main ()
|
||||
@@ -34719,7 +34720,7 @@ int main()
|
||||
* (double) (1U << ((DBL_MANT_DIG + 3) / 5))
|
||||
* (double) (1U << ((DBL_MANT_DIG + 4) / 5));
|
||||
volatile double x = 0.5 - 0.5 / TWO_MANT_DIG;
|
||||
- exit (x < 0.5 && round (x) != 0.0);
|
||||
+ return x < 0.5 && round (x) != 0.0;
|
||||
}
|
||||
_ACEOF
|
||||
if ac_fn_c_try_run "$LINENO"; then :
|
||||
diff --git a/m4/link.m4 b/m4/link.m4
|
||||
index 77f5a2b9c0fa621a..c014599bd3758dcf 100644
|
||||
--- a/m4/link.m4
|
||||
+++ b/m4/link.m4
|
||||
@@ -22,6 +22,7 @@ AC_DEFUN([gl_FUNC_LINK],
|
||||
AC_RUN_IFELSE(
|
||||
[AC_LANG_PROGRAM(
|
||||
[[#include <unistd.h>
|
||||
+ #include <stdio.h>
|
||||
]],
|
||||
[[int result = 0;
|
||||
if (!link ("conftest.a", "conftest.b/"))
|
||||
diff --git a/m4/round.m4 b/m4/round.m4
|
||||
index 35ffa40ee2df0c3e..4b0896f7daf6ef1e 100644
|
||||
--- a/m4/round.m4
|
||||
+++ b/m4/round.m4
|
||||
@@ -57,7 +57,7 @@ int main()
|
||||
* (double) (1U << ((DBL_MANT_DIG + 3) / 5))
|
||||
* (double) (1U << ((DBL_MANT_DIG + 4) / 5));
|
||||
volatile double x = 0.5 - 0.5 / TWO_MANT_DIG;
|
||||
- exit (x < 0.5 && round (x) != 0.0);
|
||||
+ return x < 0.5 && round (x) != 0.0;
|
||||
}]])], [gl_cv_func_round_works=yes], [gl_cv_func_round_works=no],
|
||||
[case "$host_os" in
|
||||
netbsd* | aix*) gl_cv_func_round_works="guessing no";;
|
|
@ -0,0 +1,53 @@
|
|||
Avoid implicit ints in the guile_cv_localtime_cache check. It cause
|
||||
the check to always fail with strict(er) C99 compilers that do not
|
||||
support implicit int.
|
||||
|
||||
Submitted upstream:
|
||||
|
||||
<https://lists.gnu.org/archive/html/bug-guile/2022-12/msg00017.html>
|
||||
<https://debbugs.gnu.org/cgi/bugreport.cgi?bug=60022>
|
||||
|
||||
diff --git a/configure b/configure
|
||||
index e2816d1ead4b34ba..f541916fc08f88f6 100755
|
||||
--- a/configure
|
||||
+++ b/configure
|
||||
@@ -52466,7 +52466,7 @@ else
|
||||
# include <stdlib.h>
|
||||
#endif
|
||||
extern char **environ;
|
||||
-unset_TZ ()
|
||||
+int unset_TZ ()
|
||||
{
|
||||
char **from, **to;
|
||||
for (to = from = environ; (*to = *from); from++)
|
||||
@@ -52475,7 +52475,7 @@ unset_TZ ()
|
||||
}
|
||||
char TZ_GMT0[] = "TZ=GMT0";
|
||||
char TZ_PST8[] = "TZ=PST8";
|
||||
-main()
|
||||
+int main()
|
||||
{
|
||||
time_t now = time ((time_t *) 0);
|
||||
int hour_GMT0, hour_unset;
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 0a7b29045b9ac5ec..50d024d7ec057073 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -1086,7 +1086,7 @@ AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <time.h>
|
||||
# include <stdlib.h>
|
||||
#endif
|
||||
extern char **environ;
|
||||
-unset_TZ ()
|
||||
+int unset_TZ ()
|
||||
{
|
||||
char **from, **to;
|
||||
for (to = from = environ; (*to = *from); from++)
|
||||
@@ -1095,7 +1095,7 @@ unset_TZ ()
|
||||
}
|
||||
char TZ_GMT0[] = "TZ=GMT0";
|
||||
char TZ_PST8[] = "TZ=PST8";
|
||||
-main()
|
||||
+int main()
|
||||
{
|
||||
time_t now = time ((time_t *) 0);
|
||||
int hour_GMT0, hour_unset;
|
|
@ -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))
|
||||
|
||||
|
||||
|
|
82
guile.spec
82
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: 34.0.riscv64%{?dist}
|
||||
Epoch: 5
|
||||
Source: ftp://ftp.gnu.org/pub/gnu/guile/guile-%{version}.tar.xz
|
||||
URL: http://www.gnu.org/software/guile/
|
||||
License: LGPLv3+
|
||||
License: LGPL-3.0-or-later AND LGPL-2.0-or-later AND GPL-3.0-or-later AND LGPL-2.1-or-later
|
||||
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,9 @@ 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
|
||||
Patch7: guile-configure-c99.patch
|
||||
Patch8: guile-configure-tz-c99.patch
|
||||
|
||||
%description
|
||||
GUILE (GNU's Ubiquitous Intelligent Language for Extension) is a library
|
||||
|
@ -51,20 +55,20 @@ install the guile package.
|
|||
%ifarch ppc64le
|
||||
%patch5 -p1 -b .ieeetest
|
||||
%endif
|
||||
%patch6 -p1 -b .configure
|
||||
%patch7 -p1
|
||||
%patch8 -p1
|
||||
|
||||
%build
|
||||
autoreconf -fiv
|
||||
|
||||
# The -O2 option in CFLAGS seems to cause the build to fail on
|
||||
# some archs (bug #1675089)
|
||||
%ifarch armv7hl ppc64le
|
||||
%ifarch armv7hl ppc64le s390x
|
||||
export CFLAGS="$(echo $RPM_OPT_FLAGS | sed 's/-O2/-Os/')"
|
||||
%endif
|
||||
|
||||
%configure --disable-static --disable-error-on-warning
|
||||
|
||||
# Remove RPATH
|
||||
sed -i 's|" $sys_lib_dlsearch_path "|" $sys_lib_dlsearch_path %{_libdir} "|' \
|
||||
libtool
|
||||
%configure --disable-static --disable-error-on-warning --disable-rpath
|
||||
|
||||
%{make_build}
|
||||
|
||||
|
@ -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,64 @@ fi
|
|||
%{_includedir}/guile
|
||||
|
||||
%changelog
|
||||
* Tue Dec 05 2023 David Abdurachmanov <davidlt@rivosinc.com> - 5:2.0.14-34.0.riscv64
|
||||
- Switch to --disable-rpath
|
||||
|
||||
* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 5:2.0.14-34
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
|
||||
|
||||
* Mon Mar 13 2023 Tomas Korbar <tkorbar@redhat.com> - 2.0.14-33
|
||||
- Change the License tag to the SPDX format
|
||||
|
||||
* Thu Mar 02 2023 Tomas Korbar <tkorbar@redhat.com> - 2.0.14-32
|
||||
- Change optimization to -Os on s390x architecture
|
||||
- Resolves: rhbz#2171564
|
||||
|
||||
* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 5:2.0.14-31
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
|
||||
|
||||
* Mon Dec 12 2022 Florian Weimer <fweimer@redhat.com> - 5:2.0.14-30
|
||||
- Port configure script to C99
|
||||
|
||||
* 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