Merge remote-tracking branch 'up/main' into main-riscv64
Signed-off-by: David Abdurachmanov <davidlt@rivosinc.com>
This commit is contained in:
commit
1cf6e99629
|
@ -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;
|
29
guile.spec
29
guile.spec
|
@ -2,11 +2,11 @@ Summary: A GNU implementation of Scheme for application extensibility
|
||||||
Name: guile
|
Name: guile
|
||||||
%define mver 2.0
|
%define mver 2.0
|
||||||
Version: 2.0.14
|
Version: 2.0.14
|
||||||
Release: 29.1.riscv64%{?dist}
|
Release: 34.0.riscv64%{?dist}
|
||||||
Epoch: 5
|
Epoch: 5
|
||||||
Source: ftp://ftp.gnu.org/pub/gnu/guile/guile-%{version}.tar.xz
|
Source: ftp://ftp.gnu.org/pub/gnu/guile/guile-%{version}.tar.xz
|
||||||
URL: http://www.gnu.org/software/guile/
|
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: gcc libtool libtool-ltdl-devel gmp-devel readline-devel
|
||||||
BuildRequires: gettext-devel libunistring-devel libffi-devel gc-devel
|
BuildRequires: gettext-devel libunistring-devel libffi-devel gc-devel
|
||||||
BuildRequires: make
|
BuildRequires: make
|
||||||
|
@ -20,6 +20,8 @@ Patch3: guile-threadstest.patch
|
||||||
Patch4: guile-2.0.14-gc_pkgconfig_private.patch
|
Patch4: guile-2.0.14-gc_pkgconfig_private.patch
|
||||||
Patch5: guile-ieeetest.patch
|
Patch5: guile-ieeetest.patch
|
||||||
Patch6: guile-configure.patch
|
Patch6: guile-configure.patch
|
||||||
|
Patch7: guile-configure-c99.patch
|
||||||
|
Patch8: guile-configure-tz-c99.patch
|
||||||
|
|
||||||
%description
|
%description
|
||||||
GUILE (GNU's Ubiquitous Intelligent Language for Extension) is a library
|
GUILE (GNU's Ubiquitous Intelligent Language for Extension) is a library
|
||||||
|
@ -54,13 +56,15 @@ install the guile package.
|
||||||
%patch5 -p1 -b .ieeetest
|
%patch5 -p1 -b .ieeetest
|
||||||
%endif
|
%endif
|
||||||
%patch6 -p1 -b .configure
|
%patch6 -p1 -b .configure
|
||||||
|
%patch7 -p1
|
||||||
|
%patch8 -p1
|
||||||
|
|
||||||
%build
|
%build
|
||||||
autoreconf -fiv
|
autoreconf -fiv
|
||||||
|
|
||||||
# The -O2 option in CFLAGS seems to cause the build to fail on
|
# The -O2 option in CFLAGS seems to cause the build to fail on
|
||||||
# some archs (bug #1675089)
|
# some archs (bug #1675089)
|
||||||
%ifarch armv7hl ppc64le
|
%ifarch armv7hl ppc64le s390x
|
||||||
export CFLAGS="$(echo $RPM_OPT_FLAGS | sed 's/-O2/-Os/')"
|
export CFLAGS="$(echo $RPM_OPT_FLAGS | sed 's/-O2/-Os/')"
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
|
@ -165,11 +169,24 @@ fi
|
||||||
%{_includedir}/guile
|
%{_includedir}/guile
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
* Thu Sep 29 2022 David Abdurachmanov <davidlt@rivosinc.com> - 5:2.0.14-29.1.riscv64
|
* Tue Dec 05 2023 David Abdurachmanov <davidlt@rivosinc.com> - 5:2.0.14-34.0.riscv64
|
||||||
- Switch to --disable-rpath
|
- Switch to --disable-rpath
|
||||||
|
|
||||||
* Thu Sep 29 2022 David Abdurachmanov <davidlt@rivosinc.com> - 5:2.0.14-29.0.riscv64
|
* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 5:2.0.14-34
|
||||||
- Change RPATH to /usr/lib/lp64d
|
- 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
|
* 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
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
|
||||||
|
|
Loading…
Reference in New Issue