diff --git a/autoconf.changes b/autoconf.changes index c48cc95..a5a7f17 100644 --- a/autoconf.changes +++ b/autoconf.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Tue Feb 13 09:22:52 UTC 2024 - Valentin Lefebvre + +- Re-add patch (bsc#1219035) + * [autoreconf-ltdl.diff] +- Remove test with macro LARGEFILE and YEAR2038, broken for i586 arch. see + https://git.savannah.gnu.org/cgit/autoconf.git/tree/NEWS#n194 (bsc#1219035) + * [remove-largefile-test.patch] + ------------------------------------------------------------------- Sun Dec 24 08:49:46 UTC 2023 - Martin Pluskal diff --git a/autoconf.spec b/autoconf.spec index bf2c611..aae8291 100644 --- a/autoconf.spec +++ b/autoconf.spec @@ -1,7 +1,7 @@ # # spec file # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -33,6 +33,9 @@ URL: https://www.gnu.org/software/autoconf Source0: https://ftp.gnu.org/gnu/autoconf/autoconf-%{version}.tar.xz Source1: https://ftp.gnu.org/gnu/autoconf/autoconf-%{version}.tar.xz.sig Source9: autoconf.keyring +Patch0: autoreconf-ltdl.diff +# Upstream's Known bug: see https://git.savannah.gnu.org/cgit/autoconf.git/tree/NEWS#n194 +Patch1: remove-largefile-test.patch BuildRequires: help2man BuildRequires: m4 >= 1.4.16 BuildArch: noarch @@ -65,7 +68,11 @@ be configuring software with an autoconf-generated script; autoconf is only required for the generation of the scripts, not their use. %prep -%autosetup -n autoconf-%{version} +%setup -q -n autoconf-%{version} +%patch0 -p1 +%if "%_arch" == "i386" +%patch1 -p1 +%endif %build %configure diff --git a/autoreconf-ltdl.diff b/autoreconf-ltdl.diff new file mode 100644 index 0000000..e045b2c --- /dev/null +++ b/autoreconf-ltdl.diff @@ -0,0 +1,21 @@ +diff -Pdpru autoconf-2.72/bin/autoreconf.in autoconf-2.72-new/bin/autoreconf.in +--- autoconf-2.72/bin/autoreconf.in 2023-12-19 22:13:19.000000000 +0100 ++++ autoconf-2.72-new/bin/autoreconf.in 2024-02-19 11:01:32.513106786 +0100 +@@ -595,6 +595,8 @@ sub autoreconf_current_directory ($) + 'AC_CONFIG_AUX_DIR', + 'AC_CONFIG_HEADERS', + 'AC_CONFIG_SUBDIRS', ++ 'AC_LIBLTDL_CONVENIENCE', ++ 'AC_LIBLTDL_INSTALLABLE', + 'AC_INIT', + 'AC_REQUIRE_AUX_FILE', + 'AC_PROG_LIBTOOL', +@@ -620,6 +622,8 @@ sub autoreconf_current_directory ($) + || $macro eq "AM_PROG_LIBTOOL" + || $macro eq "LT_INIT"; + $uses_libltdl = 1 if $macro eq "LT_CONFIG_LTDL_DIR"; ++ $uses_libltdl = 1 if $macro eq "AC_LIBLTDL_CONVENIENCE"; ++ $uses_libltdl = 1 if $macro eq "AC_LIBLTDL_INSTALLABLE"; + $uses_autoheader = 1 if $macro eq "AC_CONFIG_HEADERS"; + $uses_automake = 1 if $macro eq "AM_INIT_AUTOMAKE"; + $uses_intltool = 1 if $macro eq "IT_PROG_INTLTOOL"; diff --git a/remove-largefile-test.patch b/remove-largefile-test.patch new file mode 100644 index 0000000..a80d916 --- /dev/null +++ b/remove-largefile-test.patch @@ -0,0 +1,62 @@ +diff -Ppdru autoconf-2.72/tests/semantics.at autoconf-2.72-new/tests/semantics.at +--- autoconf-2.72/tests/semantics.at 2024-02-19 11:10:24.680204892 +0100 ++++ autoconf-2.72-new/tests/semantics.at 2024-02-19 18:30:59.290253324 +0100 +@@ -901,58 +901,6 @@ AT_CHECK_DEFINES( + + AT_CLEANUP + +-## -------------------------------------------------------------------- ## +-## AC_SYS_LARGEFILE, AC_SYS_YEAR2038, and AC_SYS_YEAR2038_RECOMMENDED. ## +-## -------------------------------------------------------------------- ## +- +-AT_CHECK_MACRO([AC_SYS_LARGEFILE], [], +-[AT_CHECK([./configure --help | +- $EGREP -e '-(dis|en)able-(largefile|year2038)\>'], +- [0], +-[ --disable-largefile omit support for large files +- --enable-year2038 support timestamps after 2038 +-], +-[])]) +- +-AT_CHECK_MACRO([AC_SYS_YEAR2038], [], +-[AT_CHECK([./configure --help | +- $EGREP -e '-(dis|en)able-(largefile|year2038)\>'], +- [0], +-[ --disable-largefile omit support for large files +- --disable-year2038 don't support timestamps after 2038 +-], +-[])]) +- +-AT_CHECK_MACRO([AC_SYS_YEAR2038_RECOMMENDED], [], +-[AT_CHECK([./configure --help | +- $EGREP -e '-(dis|en)able-(largefile|year2038)\>'], +- [0], +-[ --disable-largefile omit support for large files +- --disable-year2038 don't support timestamps after 2038 +-], +-[])], +-[], [], +-[dnl Skip this test on systems that do not support 64-bit time_t at +-dnl all. AC_SYS_YEAR2038_RECOMMENDED will make configure fail on +-dnl those systems. I'd like to make this be a test that it *does* +-dnl make configure fail on those systems, but that would require +-dnl adding features to AT_CHECK_MACRO. +-AT_DATA([configure.ac], +-[[AC_INIT +-AC_PROG_CC +-AC_SYS_YEAR2038 +-AC_COMPUTE_INT([sizeof_time_t], [sizeof(time_t)], +- [@%:@include ], +- [sizeof_time_t=0]) +-AS@&t@_IF([test $sizeof_time_t -lt 8], +- [AC_MSG_FAILURE([could not widen time_t])]) +-AC_OUTPUT +-]]) +-AT_CHECK_AUTOCONF +-AT_CAPTURE_FILE([config.log]) +-AT_CHECK([./configure $configure_options || exit 77], [0], [ignore], []) +-]) +- + ## ------------------------------- ## + ## Obsolete non-updatable macros. ## + ## ------------------------------- ##