Fix FTBFS with autoconf 2.72 (#2264449)

This commit is contained in:
Scott Talbert 2024-02-15 19:14:14 -05:00
parent 1b7b7da0a5
commit b9987bfddf
2 changed files with 41 additions and 1 deletions

View File

@ -0,0 +1,36 @@
From 00dff6e3bce72cc444c0602e13cf346a3340746b Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Wed, 27 Dec 2023 16:08:37 +0100
Subject: [PATCH] Stop using $EGREP in configure.ac unnecessarily
We don't have DISABLED_UTILS or DISABLED_DEMOS variables, so it's
useless to exclude them from the makefiles list -- just stop doing it.
This fixes a problem with using EGREP without preceding AC_PROG_EGREP
with autoconf 2.72, as EGREP is not defined any longer with this
version.
See #24168.
---
configure | 5 +----
configure.ac | 7 +------
2 files changed, 2 insertions(+), 10 deletions(-)
diff --git a/configure.ac b/configure.ac
index 606333376711..c608f9f4cfdf 100644
--- a/configure.in
+++ b/configure.in
@@ -8048,12 +8048,7 @@ for subdir in $SUBDIRS; do
done
else
dnl assume that everything compiles for utils &c
- dnl any that shouldn't be built can be added to
- dnl DISABLED_UTILS, DISABLED_DEMOS
- disabled_var=DISABLED_`echo $subdir | tr '[[a-z]]' '[[A-Z]]'`
- eval "disabled=\$$disabled_var"
- disabled=/`echo X $disabled | sed 's@ @/|/@g'`/
- makefiles=`(cd $srcdir ; find $subdir -name Makefile.in) | $EGREP -v "$disabled"`
+ makefiles=`(cd $srcdir ; find $subdir -name Makefile.in)`
fi
else
dnl we build wxBase only

View File

@ -5,7 +5,7 @@
Name: wxGTK
Version: 3.2.4
Release: 5%{?dist}
Release: 6%{?dist}
Summary: GTK port of the wxWidgets GUI library
License: wxWidgets
URL: https://www.wxwidgets.org/
@ -18,6 +18,7 @@ Source10: wx-config
Patch0: %{name}-3.1.6-abicheck.patch
Patch1: tests-no-deprecated-copy-dtor.patch
Patch2: https://github.com/wxWidgets/wxWidgets/commit/1622a5c9c2f123ef27fc3a52938162a68892e725.patch
Patch3: fix-ftbfs-autoconf-2.72.patch
BuildRequires: make
BuildRequires: gcc-c++
@ -321,6 +322,9 @@ fi
%doc html
%changelog
* Fri Feb 16 2024 Scott Talbert <swt@techie.net> - 3.2.4-6
- Fix FTBFS with autoconf 2.72 (#2264449)
* Sun Feb 04 2024 Scott Talbert <swt@techie.net> - 3.2.4-5
- Enable wxLZMAInputStream (#2258458)