From 0459b344e6334d028e9f2e23a3ee25eba69be150 Mon Sep 17 00:00:00 2001 From: Kevin Buettner Date: Tue, 20 Jul 2021 21:57:59 -0400 Subject: [PATCH] Remove autoconf invocations from spec file. Remove BuildRequires: autoconf. --- gdb-config.patch | 56 ------------------------------------------------ gdb.spec | 17 +++++---------- 2 files changed, 5 insertions(+), 68 deletions(-) delete mode 100644 gdb-config.patch diff --git a/gdb-config.patch b/gdb-config.patch deleted file mode 100644 index b26d668..0000000 --- a/gdb-config.patch +++ /dev/null @@ -1,56 +0,0 @@ -diff -Nrup a/gnulib/import/m4/alloca.m4 b/gnulib/import/m4/alloca.m4 ---- a/gnulib/import/m4/alloca.m4 2019-11-18 18:49:20.000000000 -0700 -+++ b/gnulib/import/m4/alloca.m4 2020-01-11 01:07:36.200483085 -0700 -@@ -89,7 +89,7 @@ AC_CACHE_CHECK([stack direction for C al - [ac_cv_c_stack_direction], - [AC_RUN_IFELSE([AC_LANG_SOURCE( - [AC_INCLUDES_DEFAULT --int -+__attribute__ (noinline,noclone)) int - find_stack_direction (int *addr, int depth) - { - int dir, dummy = 0; -diff -Nrup a/libiberty/aclocal.m4 b/libiberty/aclocal.m4 ---- a/libiberty/aclocal.m4 2019-01-19 09:01:34.000000000 -0700 -+++ b/libiberty/aclocal.m4 2020-01-09 22:00:27.183312982 -0700 -@@ -147,7 +147,7 @@ if test $ac_cv_os_cray = yes; then - fi - - AC_CACHE_CHECK(stack direction for C alloca, ac_cv_c_stack_direction, --[AC_TRY_RUN([find_stack_direction () -+[AC_TRY_RUN([__attribute__ ((noclone,noinline)) find_stack_direction () - { - static char *addr = 0; - auto char dummy; -diff --git a/config/intdiv0.m4 b/config/intdiv0.m4 -index 55dddcf1..ba906efc 100644 ---- a/config/intdiv0.m4 -+++ b/config/intdiv0.m4 -@@ -31,10 +31,10 @@ sigfpe_handler (sig) int sig; - exit (sig != SIGFPE); - } - --int x = 1; --int y = 0; --int z; --int nan; -+volatile int x = 1; -+volatile int y = 0; -+volatile int z; -+volatile int nan; - - int main () - { -diff --git a/libiberty/configure.ac b/libiberty/configure.ac -index f1ce7601..fc20d228 100644 ---- a/libiberty/configure.ac -+++ b/libiberty/configure.ac -@@ -661,7 +661,7 @@ if test -z "${setobjs}"; then - for v in $vars; do - AC_MSG_CHECKING([for $v]) - AC_CACHE_VAL(libiberty_cv_var_$v, -- [AC_LINK_IFELSE([AC_LANG_PROGRAM([[int *p;]],[[extern int $v []; p = $v;]])], -+ [AC_LINK_IFELSE([AC_LANG_PROGRAM([[__attribute__ ((used)) int *p;]],[[extern int $v []; p = $v;]])], - [eval "libiberty_cv_var_$v=yes"], - [eval "libiberty_cv_var_$v=no"])]) - if eval "test \"`echo '$libiberty_cv_var_'$v`\" = yes"; then diff --git a/gdb.spec b/gdb.spec index d533f92..90c473a 100644 --- a/gdb.spec +++ b/gdb.spec @@ -37,7 +37,7 @@ Version: 10.2 # The release always contains a leading reserved number, start it at 1. # `upstream' is not a part of `name' to stay fully rpm dependencies compatible for the testing. -Release: 4%{?dist} +Release: 5%{?dist} License: GPLv3+ and GPLv3+ with exceptions and GPLv2+ and GPLv2+ with exceptions and GPL+ and LGPLv2+ and LGPLv3+ and BSD and Public Domain and GFDL # Do not provide URL for snapshots as the file lasts there only for 2 days. @@ -157,8 +157,6 @@ Recommends: %{librpmname} BuildRequires: %{?scl_prefix}gcc-c++ %endif -BuildRequires: autoconf - # GDB patches have the format `gdb--bz-.patch'. # They should be created using patch level 1: diff -up ./gdb (or gdb-6.3/gdb). @@ -470,15 +468,6 @@ find -name "*.info*"|xargs rm -f # See README.local-patches for more details. %include %{PATCH9999} -# The above patches twiddle a .m4 file for configure, so update the affected -# configure files -pushd libiberty -autoconf -f -popd -pushd intl -autoconf -f -popd - find -name "*.orig" | xargs rm -f ! find -name "*.rej" # Should not happen. @@ -1154,6 +1143,10 @@ fi %endif %changelog +* Tue Jul 20 2021 Kevin Buettner - 10.2-5 +- Remove autoconf invocations from spec file. +- Remove BuildRequires: autoconf. + * Mon Jun 14 2021 Kevin Buettner - 10.2-4 - Backport upstream patches which fix multi-threaded debugging for glibc-2.34 (RHBZ 1971096, Simon Marchi, Kevin Buettner).