diff --git a/Port-AC_SYS_LARGEFILE-to-C.patch b/Port-AC_SYS_LARGEFILE-to-C.patch new file mode 100644 index 0000000..36c9af7 --- /dev/null +++ b/Port-AC_SYS_LARGEFILE-to-C.patch @@ -0,0 +1,87 @@ +From b71143738516017f0e0d347a4025301c06c40254 Mon Sep 17 00:00:00 2001 +From: Paul Eggert +Date: Wed, 24 Apr 2024 14:47:56 -0700 +Subject: [PATCH] Port AC_SYS_LARGEFILE to C++ +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Problem reported by Zack Weinberg +. +* lib/autoconf/specific.m4 (_AC_SYS_YEAR2038_PROBE) +(_AC_SYS_LARGEFILE_PROBE): +In chatter, say it’s a CPPFLAGS option, not a CC option. +(_AC_SYS_LARGEFILE_OPTIONS): Omit -n32, as we no longer +need to worry about IRIX. +(_AC_SYS_LARGEFILE_PROBE): Fiddle with CPPFLAGS, not CC, +and don’t worry about -n32. +--- + lib/autoconf/specific.m4 | 18 +++++++----------- + 1 file changed, 7 insertions(+), 11 deletions(-) + +diff --git a/lib/autoconf/specific.m4 b/lib/autoconf/specific.m4 +index a0e1fa8d..0d0191a8 100644 +--- a/lib/autoconf/specific.m4 ++++ b/lib/autoconf/specific.m4 +@@ -132,7 +132,7 @@ m4_define([_AC_SYS_YEAR2038_OPTIONS], m4_normalize( + # If you change this macro you may also need to change + # _AC_SYS_YEAR2038_OPTIONS. + AC_DEFUN([_AC_SYS_YEAR2038_PROBE], +-[AC_CACHE_CHECK([for $CC option for timestamps after 2038], ++[AC_CACHE_CHECK([for $CPPFLAGS option for timestamps after 2038], + [ac_cv_sys_year2038_opts], + [ac_save_CPPFLAGS="$CPPFLAGS" + ac_opt_found=no +@@ -262,7 +262,6 @@ m4_define([_AC_SYS_LARGEFILE_OPTIONS], m4_normalize( + ["none needed"] dnl Most current systems + ["-D_FILE_OFFSET_BITS=64"] dnl X/Open LFS spec + ["-D_LARGE_FILES=1"] dnl 32-bit AIX 4.2.1+, 32-bit z/OS +- ["-n32"] dnl 32-bit IRIX 6, SGI cc (obsolete) + )) + + # _AC_SYS_LARGEFILE_PROBE +@@ -279,25 +278,25 @@ m4_define([_AC_SYS_LARGEFILE_OPTIONS], m4_normalize( + # If you change this macro you may also need to change + # _AC_SYS_LARGEFILE_OPTIONS. + AC_DEFUN([_AC_SYS_LARGEFILE_PROBE], +-[AC_CACHE_CHECK([for $CC option to enable large file support], ++[AC_CACHE_CHECK([for $CPPFLAGS option for large files], + [ac_cv_sys_largefile_opts], +- [ac_save_CC="$CC" ++ [ac_save_CPPFLAGS=$CPPFLAGS + ac_opt_found=no + for ac_opt in _AC_SYS_LARGEFILE_OPTIONS; do + AS_IF([test x"$ac_opt" != x"none needed"], +- [CC="$ac_save_CC $ac_opt"]) ++ [CPPFLAGS="$ac_save_CPPFLAGS $ac_opt"]) + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([_AC_SYS_LARGEFILE_TEST_CODE])], + [AS_IF([test x"$ac_opt" = x"none needed"], + [# GNU/Linux s390x and alpha need _FILE_OFFSET_BITS=64 for wide ino_t. +- CC="$CC -DFTYPE=ino_t" ++ CPPFLAGS="$CPPFLAGS -DFTYPE=ino_t" + AC_COMPILE_IFELSE([], [], +- [CC="$CC -D_FILE_OFFSET_BITS=64" ++ [CPPFLAGS="$CPPFLAGS -D_FILE_OFFSET_BITS=64" + AC_COMPILE_IFELSE([], [ac_opt='-D_FILE_OFFSET_BITS=64'])])]) + ac_cv_sys_largefile_opts=$ac_opt + ac_opt_found=yes]) + test $ac_opt_found = no || break + done +- CC="$ac_save_CC" ++ CPPFLAGS=$ac_save_CPPFLAGS + dnl Gnulib implements large file support for native Windows, based on the + dnl variables WINDOWS_64_BIT_OFF_T, WINDOWS_64_BIT_ST_SIZE. + m4_ifdef([gl_LARGEFILE], [ +@@ -327,9 +326,6 @@ AS_CASE([$ac_cv_sys_largefile_opts], + [AC_DEFINE([_LARGE_FILES], [1], + [Define to 1 on platforms where this makes off_t a 64-bit type.])], + +- ["-n32"], +- [CC="$CC -n32"], +- + [AC_MSG_ERROR( + [internal error: bad value for \$ac_cv_sys_largefile_opts])]) + +-- +2.35.3 + diff --git a/autoconf.changes b/autoconf.changes index d51ee62..050fc0d 100644 --- a/autoconf.changes +++ b/autoconf.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Thu May 2 09:47:58 UTC 2024 - Valentin Lefebvre + +- Fix AC_SYS_LARGEFILE doesn't honor AC_LANG setting and undo the removing of + the largefile test. (bsc#1219035) + + Port-AC_SYS_LARGEFILE-to-C.patch + - remove-largefile-test.patch + ------------------------------------------------------------------- Tue Feb 20 10:21:03 UTC 2024 - Dominique Leuenberger diff --git a/autoconf.spec b/autoconf.spec index 6ced525..232d278 100644 --- a/autoconf.spec +++ b/autoconf.spec @@ -24,6 +24,7 @@ %else %global psuffix %{nil} %endif + Name: autoconf%{?psuffix} Version: 2.72 Release: 0 @@ -34,8 +35,8 @@ 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 +# PATCH-FIX-UPSTREAM: Fix problem https://savannah.gnu.org/support/?110983 +Patch1: Port-AC_SYS_LARGEFILE-to-C.patch BuildRequires: help2man BuildRequires: m4 >= 1.4.16 BuildArch: noarch @@ -68,11 +69,7 @@ be configuring software with an autoconf-generated script; autoconf is only required for the generation of the scripts, not their use. %prep -%setup -q -n autoconf-%{version} -%patch -P 0 -p1 -%if "%_arch" == "i386" -%patch -P 1 -p1 -%endif +%autosetup -p1 -n autoconf-%{version} %build %configure diff --git a/remove-largefile-test.patch b/remove-largefile-test.patch deleted file mode 100644 index a80d916..0000000 --- a/remove-largefile-test.patch +++ /dev/null @@ -1,62 +0,0 @@ -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. ## - ## ------------------------------- ##