Control: tag -1 + pending On Tue, Mar 25, 2025 at 06:39:35PM +0100, Bastian Germann wrote: > Control: forwarded -1 > https://git.savannah.gnu.org/cgit/autoconf.git/commit/?id=b71143738516017f0e0d347a4025301c06c40254 > Control: severity -1 serious > Control: tags -1 patch fixed-upstream > > This breaks rdfind build on i386 as documented in #1091577. > Upstream has fixed this with the forwarded commit which applies cleanly > to autoconf 2.72. Please consider including this for trixie.
I uploaded an NMU with this patch to DELAYED/2-days. nmudiff attached. Kind regards Philipp Kern
diff -Nru autoconf-2.72/debian/changelog autoconf-2.72/debian/changelog --- autoconf-2.72/debian/changelog 2024-08-16 15:17:28.000000000 +0200 +++ autoconf-2.72/debian/changelog 2025-04-13 10:42:16.000000000 +0200 @@ -1,3 +1,11 @@ +autoconf (2.72-3.1) unstable; urgency=medium + + * Non-maintainer upload + * Let AC_SYS_LARGEFILE output to CPPFLAGS - fixing LFS support on i386. + (Closes: #852617) + + -- Philipp Kern <[email protected]> Sun, 13 Apr 2025 10:42:16 +0200 + autoconf (2.72-3) unstable; urgency=medium * Upload to unstable. diff -Nru autoconf-2.72/debian/patches/port-ac_sys_largefile-to-cxx.patch autoconf-2.72/debian/patches/port-ac_sys_largefile-to-cxx.patch --- autoconf-2.72/debian/patches/port-ac_sys_largefile-to-cxx.patch 1970-01-01 01:00:00.000000000 +0100 +++ autoconf-2.72/debian/patches/port-ac_sys_largefile-to-cxx.patch 2025-04-13 10:41:47.000000000 +0200 @@ -0,0 +1,84 @@ +Description: Port AC_SYS_LARGEFILE to C++ + Problem reported by Zack Weinberg + <https://savannah.gnu.org/support/?110983>. + * 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. +Author: Paul Eggert <[email protected]> +Bug-Debian: http://bugs.debian.org/852617 +Applied-Upstream: https://git.savannah.gnu.org/cgit/autoconf.git/commit/?id=b71143738516017f0e0d347a4025301c06c40254 + +--- + 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 a0e1fa8..0d0191a 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])]) + +-- +cgit v1.1 + diff -Nru autoconf-2.72/debian/patches/series autoconf-2.72/debian/patches/series --- autoconf-2.72/debian/patches/series 2024-03-15 15:17:07.000000000 +0100 +++ autoconf-2.72/debian/patches/series 2025-04-13 10:41:57.000000000 +0200 @@ -5,3 +5,5 @@ #stricter-versioning.patch #fix-cxx-stdcxx-test.diff + +port-ac_sys_largefile-to-cxx.patch
