801c88295e
Add the patches with real changes from the binutils 2.40 stable branch. I am not aware that we ran into any of these problems, but I think it is better to take the existing stable patches. They were exported like this: git format-patch binutils-2_40...origin/binutils-2_40-branch I removed the patches changing the version numbers and updating the translations only. I removed the following patches: *Automatic-date-updat* 001-Re-enable-development.-Update-version-to-2.40.0.patch 004-Updated-translations-for-the-gas-and-binutils-sub-di.patch 015-Updated-Swedish-translation-for-the-binutils-sub-dir.patch 027-Updated-Swedish-translation-for-the-binutils-sub-dir.patch Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
445 lines
14 KiB
Diff
445 lines
14 KiB
Diff
From 59706683feafb6252d0ad369cf8759f75fd147be Mon Sep 17 00:00:00 2001
|
|
From: Nick Clifton <nickc@redhat.com>
|
|
Date: Tue, 17 Jan 2023 12:02:56 +0000
|
|
Subject: [PATCH 07/50] Fix version number snafu in some configuration files:
|
|
2.40.00 should be 2.40
|
|
|
|
---
|
|
binutils/configure | 20 ++++++++++----------
|
|
gprof/configure | 20 ++++++++++----------
|
|
gprofng/configure | 20 ++++++++++----------
|
|
gprofng/doc/version.texi | 4 ++--
|
|
gprofng/libcollector/configure | 20 ++++++++++----------
|
|
ld/configure | 20 ++++++++++----------
|
|
6 files changed, 52 insertions(+), 52 deletions(-)
|
|
|
|
--- a/binutils/configure
|
|
+++ b/binutils/configure
|
|
@@ -1,6 +1,6 @@
|
|
#! /bin/sh
|
|
# Guess values for system-dependent variables and create Makefiles.
|
|
-# Generated by GNU Autoconf 2.69 for binutils 2.40.00.
|
|
+# Generated by GNU Autoconf 2.69 for binutils 2.40.
|
|
#
|
|
#
|
|
# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
|
|
@@ -587,8 +587,8 @@ MAKEFLAGS=
|
|
# Identity of this package.
|
|
PACKAGE_NAME='binutils'
|
|
PACKAGE_TARNAME='binutils'
|
|
-PACKAGE_VERSION='2.40.00'
|
|
-PACKAGE_STRING='binutils 2.40.00'
|
|
+PACKAGE_VERSION='2.40'
|
|
+PACKAGE_STRING='binutils 2.40'
|
|
PACKAGE_BUGREPORT=''
|
|
PACKAGE_URL=''
|
|
|
|
@@ -1401,7 +1401,7 @@ if test "$ac_init_help" = "long"; then
|
|
# Omit some internal or obsolete options to make the list less imposing.
|
|
# This message is too long to be a string in the A/UX 3.1 sh.
|
|
cat <<_ACEOF
|
|
-\`configure' configures binutils 2.40.00 to adapt to many kinds of systems.
|
|
+\`configure' configures binutils 2.40 to adapt to many kinds of systems.
|
|
|
|
Usage: $0 [OPTION]... [VAR=VALUE]...
|
|
|
|
@@ -1472,7 +1472,7 @@ fi
|
|
|
|
if test -n "$ac_init_help"; then
|
|
case $ac_init_help in
|
|
- short | recursive ) echo "Configuration of binutils 2.40.00:";;
|
|
+ short | recursive ) echo "Configuration of binutils 2.40:";;
|
|
esac
|
|
cat <<\_ACEOF
|
|
|
|
@@ -1631,7 +1631,7 @@ fi
|
|
test -n "$ac_init_help" && exit $ac_status
|
|
if $ac_init_version; then
|
|
cat <<\_ACEOF
|
|
-binutils configure 2.40.00
|
|
+binutils configure 2.40
|
|
generated by GNU Autoconf 2.69
|
|
|
|
Copyright (C) 2012 Free Software Foundation, Inc.
|
|
@@ -2099,7 +2099,7 @@ cat >config.log <<_ACEOF
|
|
This file contains any messages produced by compilers while
|
|
running configure, to aid debugging if configure makes a mistake.
|
|
|
|
-It was created by binutils $as_me 2.40.00, which was
|
|
+It was created by binutils $as_me 2.40, which was
|
|
generated by GNU Autoconf 2.69. Invocation command line was
|
|
|
|
$ $0 $@
|
|
@@ -3081,7 +3081,7 @@ fi
|
|
|
|
# Define the identity of the package.
|
|
PACKAGE='binutils'
|
|
- VERSION='2.40.00'
|
|
+ VERSION='2.40'
|
|
|
|
|
|
cat >>confdefs.h <<_ACEOF
|
|
@@ -15326,7 +15326,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_wri
|
|
# report actual input values of CONFIG_FILES etc. instead of their
|
|
# values after options handling.
|
|
ac_log="
|
|
-This file was extended by binutils $as_me 2.40.00, which was
|
|
+This file was extended by binutils $as_me 2.40, which was
|
|
generated by GNU Autoconf 2.69. Invocation command line was
|
|
|
|
CONFIG_FILES = $CONFIG_FILES
|
|
@@ -15392,7 +15392,7 @@ _ACEOF
|
|
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
|
|
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
|
|
ac_cs_version="\\
|
|
-binutils config.status 2.40.00
|
|
+binutils config.status 2.40
|
|
configured by $0, generated by GNU Autoconf 2.69,
|
|
with options \\"\$ac_cs_config\\"
|
|
|
|
--- a/gprof/configure
|
|
+++ b/gprof/configure
|
|
@@ -1,6 +1,6 @@
|
|
#! /bin/sh
|
|
# Guess values for system-dependent variables and create Makefiles.
|
|
-# Generated by GNU Autoconf 2.69 for gprof 2.40.00.
|
|
+# Generated by GNU Autoconf 2.69 for gprof 2.40.
|
|
#
|
|
#
|
|
# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
|
|
@@ -587,8 +587,8 @@ MAKEFLAGS=
|
|
# Identity of this package.
|
|
PACKAGE_NAME='gprof'
|
|
PACKAGE_TARNAME='gprof'
|
|
-PACKAGE_VERSION='2.40.00'
|
|
-PACKAGE_STRING='gprof 2.40.00'
|
|
+PACKAGE_VERSION='2.40'
|
|
+PACKAGE_STRING='gprof 2.40'
|
|
PACKAGE_BUGREPORT=''
|
|
PACKAGE_URL=''
|
|
|
|
@@ -1338,7 +1338,7 @@ if test "$ac_init_help" = "long"; then
|
|
# Omit some internal or obsolete options to make the list less imposing.
|
|
# This message is too long to be a string in the A/UX 3.1 sh.
|
|
cat <<_ACEOF
|
|
-\`configure' configures gprof 2.40.00 to adapt to many kinds of systems.
|
|
+\`configure' configures gprof 2.40 to adapt to many kinds of systems.
|
|
|
|
Usage: $0 [OPTION]... [VAR=VALUE]...
|
|
|
|
@@ -1409,7 +1409,7 @@ fi
|
|
|
|
if test -n "$ac_init_help"; then
|
|
case $ac_init_help in
|
|
- short | recursive ) echo "Configuration of gprof 2.40.00:";;
|
|
+ short | recursive ) echo "Configuration of gprof 2.40:";;
|
|
esac
|
|
cat <<\_ACEOF
|
|
|
|
@@ -1520,7 +1520,7 @@ fi
|
|
test -n "$ac_init_help" && exit $ac_status
|
|
if $ac_init_version; then
|
|
cat <<\_ACEOF
|
|
-gprof configure 2.40.00
|
|
+gprof configure 2.40
|
|
generated by GNU Autoconf 2.69
|
|
|
|
Copyright (C) 2012 Free Software Foundation, Inc.
|
|
@@ -1885,7 +1885,7 @@ cat >config.log <<_ACEOF
|
|
This file contains any messages produced by compilers while
|
|
running configure, to aid debugging if configure makes a mistake.
|
|
|
|
-It was created by gprof $as_me 2.40.00, which was
|
|
+It was created by gprof $as_me 2.40, which was
|
|
generated by GNU Autoconf 2.69. Invocation command line was
|
|
|
|
$ $0 $@
|
|
@@ -2864,7 +2864,7 @@ fi
|
|
|
|
# Define the identity of the package.
|
|
PACKAGE='gprof'
|
|
- VERSION='2.40.00'
|
|
+ VERSION='2.40'
|
|
|
|
|
|
cat >>confdefs.h <<_ACEOF
|
|
@@ -12572,7 +12572,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_wri
|
|
# report actual input values of CONFIG_FILES etc. instead of their
|
|
# values after options handling.
|
|
ac_log="
|
|
-This file was extended by gprof $as_me 2.40.00, which was
|
|
+This file was extended by gprof $as_me 2.40, which was
|
|
generated by GNU Autoconf 2.69. Invocation command line was
|
|
|
|
CONFIG_FILES = $CONFIG_FILES
|
|
@@ -12638,7 +12638,7 @@ _ACEOF
|
|
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
|
|
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
|
|
ac_cs_version="\\
|
|
-gprof config.status 2.40.00
|
|
+gprof config.status 2.40
|
|
configured by $0, generated by GNU Autoconf 2.69,
|
|
with options \\"\$ac_cs_config\\"
|
|
|
|
--- a/gprofng/configure
|
|
+++ b/gprofng/configure
|
|
@@ -1,6 +1,6 @@
|
|
#! /bin/sh
|
|
# Guess values for system-dependent variables and create Makefiles.
|
|
-# Generated by GNU Autoconf 2.69 for gprofng 2.40.00.
|
|
+# Generated by GNU Autoconf 2.69 for gprofng 2.40.
|
|
#
|
|
#
|
|
# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
|
|
@@ -587,8 +587,8 @@ MAKEFLAGS=
|
|
# Identity of this package.
|
|
PACKAGE_NAME='gprofng'
|
|
PACKAGE_TARNAME='gprofng'
|
|
-PACKAGE_VERSION='2.40.00'
|
|
-PACKAGE_STRING='gprofng 2.40.00'
|
|
+PACKAGE_VERSION='2.40'
|
|
+PACKAGE_STRING='gprofng 2.40'
|
|
PACKAGE_BUGREPORT=''
|
|
PACKAGE_URL=''
|
|
|
|
@@ -1362,7 +1362,7 @@ if test "$ac_init_help" = "long"; then
|
|
# Omit some internal or obsolete options to make the list less imposing.
|
|
# This message is too long to be a string in the A/UX 3.1 sh.
|
|
cat <<_ACEOF
|
|
-\`configure' configures gprofng 2.40.00 to adapt to many kinds of systems.
|
|
+\`configure' configures gprofng 2.40 to adapt to many kinds of systems.
|
|
|
|
Usage: $0 [OPTION]... [VAR=VALUE]...
|
|
|
|
@@ -1433,7 +1433,7 @@ fi
|
|
|
|
if test -n "$ac_init_help"; then
|
|
case $ac_init_help in
|
|
- short | recursive ) echo "Configuration of gprofng 2.40.00:";;
|
|
+ short | recursive ) echo "Configuration of gprofng 2.40:";;
|
|
esac
|
|
cat <<\_ACEOF
|
|
|
|
@@ -1547,7 +1547,7 @@ fi
|
|
test -n "$ac_init_help" && exit $ac_status
|
|
if $ac_init_version; then
|
|
cat <<\_ACEOF
|
|
-gprofng configure 2.40.00
|
|
+gprofng configure 2.40
|
|
generated by GNU Autoconf 2.69
|
|
|
|
Copyright (C) 2012 Free Software Foundation, Inc.
|
|
@@ -2079,7 +2079,7 @@ cat >config.log <<_ACEOF
|
|
This file contains any messages produced by compilers while
|
|
running configure, to aid debugging if configure makes a mistake.
|
|
|
|
-It was created by gprofng $as_me 2.40.00, which was
|
|
+It was created by gprofng $as_me 2.40, which was
|
|
generated by GNU Autoconf 2.69. Invocation command line was
|
|
|
|
$ $0 $@
|
|
@@ -3052,7 +3052,7 @@ fi
|
|
|
|
# Define the identity of the package.
|
|
PACKAGE='gprofng'
|
|
- VERSION='2.40.00'
|
|
+ VERSION='2.40'
|
|
|
|
|
|
cat >>confdefs.h <<_ACEOF
|
|
@@ -17467,7 +17467,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_wri
|
|
# report actual input values of CONFIG_FILES etc. instead of their
|
|
# values after options handling.
|
|
ac_log="
|
|
-This file was extended by gprofng $as_me 2.40.00, which was
|
|
+This file was extended by gprofng $as_me 2.40, which was
|
|
generated by GNU Autoconf 2.69. Invocation command line was
|
|
|
|
CONFIG_FILES = $CONFIG_FILES
|
|
@@ -17533,7 +17533,7 @@ _ACEOF
|
|
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
|
|
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
|
|
ac_cs_version="\\
|
|
-gprofng config.status 2.40.00
|
|
+gprofng config.status 2.40
|
|
configured by $0, generated by GNU Autoconf 2.69,
|
|
with options \\"\$ac_cs_config\\"
|
|
|
|
--- a/gprofng/doc/version.texi
|
|
+++ b/gprofng/doc/version.texi
|
|
@@ -1,4 +1,4 @@
|
|
@set UPDATED 5 January 2023
|
|
@set UPDATED-MONTH January 2023
|
|
-@set EDITION 2.40.00
|
|
-@set VERSION 2.40.00
|
|
+@set EDITION 2.40
|
|
+@set VERSION 2.40
|
|
--- a/gprofng/libcollector/configure
|
|
+++ b/gprofng/libcollector/configure
|
|
@@ -1,6 +1,6 @@
|
|
#! /bin/sh
|
|
# Guess values for system-dependent variables and create Makefiles.
|
|
-# Generated by GNU Autoconf 2.69 for gprofng 2.40.00.
|
|
+# Generated by GNU Autoconf 2.69 for gprofng 2.40.
|
|
#
|
|
#
|
|
# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
|
|
@@ -587,8 +587,8 @@ MAKEFLAGS=
|
|
# Identity of this package.
|
|
PACKAGE_NAME='gprofng'
|
|
PACKAGE_TARNAME='gprofng'
|
|
-PACKAGE_VERSION='2.40.00'
|
|
-PACKAGE_STRING='gprofng 2.40.00'
|
|
+PACKAGE_VERSION='2.40'
|
|
+PACKAGE_STRING='gprofng 2.40'
|
|
PACKAGE_BUGREPORT=''
|
|
PACKAGE_URL=''
|
|
|
|
@@ -1325,7 +1325,7 @@ if test "$ac_init_help" = "long"; then
|
|
# Omit some internal or obsolete options to make the list less imposing.
|
|
# This message is too long to be a string in the A/UX 3.1 sh.
|
|
cat <<_ACEOF
|
|
-\`configure' configures gprofng 2.40.00 to adapt to many kinds of systems.
|
|
+\`configure' configures gprofng 2.40 to adapt to many kinds of systems.
|
|
|
|
Usage: $0 [OPTION]... [VAR=VALUE]...
|
|
|
|
@@ -1396,7 +1396,7 @@ fi
|
|
|
|
if test -n "$ac_init_help"; then
|
|
case $ac_init_help in
|
|
- short | recursive ) echo "Configuration of gprofng 2.40.00:";;
|
|
+ short | recursive ) echo "Configuration of gprofng 2.40:";;
|
|
esac
|
|
cat <<\_ACEOF
|
|
|
|
@@ -1505,7 +1505,7 @@ fi
|
|
test -n "$ac_init_help" && exit $ac_status
|
|
if $ac_init_version; then
|
|
cat <<\_ACEOF
|
|
-gprofng configure 2.40.00
|
|
+gprofng configure 2.40
|
|
generated by GNU Autoconf 2.69
|
|
|
|
Copyright (C) 2012 Free Software Foundation, Inc.
|
|
@@ -1991,7 +1991,7 @@ cat >config.log <<_ACEOF
|
|
This file contains any messages produced by compilers while
|
|
running configure, to aid debugging if configure makes a mistake.
|
|
|
|
-It was created by gprofng $as_me 2.40.00, which was
|
|
+It was created by gprofng $as_me 2.40, which was
|
|
generated by GNU Autoconf 2.69. Invocation command line was
|
|
|
|
$ $0 $@
|
|
@@ -2968,7 +2968,7 @@ fi
|
|
|
|
# Define the identity of the package.
|
|
PACKAGE='gprofng'
|
|
- VERSION='2.40.00'
|
|
+ VERSION='2.40'
|
|
|
|
|
|
cat >>confdefs.h <<_ACEOF
|
|
@@ -16098,7 +16098,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_wri
|
|
# report actual input values of CONFIG_FILES etc. instead of their
|
|
# values after options handling.
|
|
ac_log="
|
|
-This file was extended by gprofng $as_me 2.40.00, which was
|
|
+This file was extended by gprofng $as_me 2.40, which was
|
|
generated by GNU Autoconf 2.69. Invocation command line was
|
|
|
|
CONFIG_FILES = $CONFIG_FILES
|
|
@@ -16164,7 +16164,7 @@ _ACEOF
|
|
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
|
|
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
|
|
ac_cs_version="\\
|
|
-gprofng config.status 2.40.00
|
|
+gprofng config.status 2.40
|
|
configured by $0, generated by GNU Autoconf 2.69,
|
|
with options \\"\$ac_cs_config\\"
|
|
|
|
--- a/ld/configure
|
|
+++ b/ld/configure
|
|
@@ -1,6 +1,6 @@
|
|
#! /bin/sh
|
|
# Guess values for system-dependent variables and create Makefiles.
|
|
-# Generated by GNU Autoconf 2.69 for ld 2.40.00.
|
|
+# Generated by GNU Autoconf 2.69 for ld 2.40.
|
|
#
|
|
#
|
|
# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
|
|
@@ -587,8 +587,8 @@ MAKEFLAGS=
|
|
# Identity of this package.
|
|
PACKAGE_NAME='ld'
|
|
PACKAGE_TARNAME='ld'
|
|
-PACKAGE_VERSION='2.40.00'
|
|
-PACKAGE_STRING='ld 2.40.00'
|
|
+PACKAGE_VERSION='2.40'
|
|
+PACKAGE_STRING='ld 2.40'
|
|
PACKAGE_BUGREPORT=''
|
|
PACKAGE_URL=''
|
|
|
|
@@ -1423,7 +1423,7 @@ if test "$ac_init_help" = "long"; then
|
|
# Omit some internal or obsolete options to make the list less imposing.
|
|
# This message is too long to be a string in the A/UX 3.1 sh.
|
|
cat <<_ACEOF
|
|
-\`configure' configures ld 2.40.00 to adapt to many kinds of systems.
|
|
+\`configure' configures ld 2.40 to adapt to many kinds of systems.
|
|
|
|
Usage: $0 [OPTION]... [VAR=VALUE]...
|
|
|
|
@@ -1494,7 +1494,7 @@ fi
|
|
|
|
if test -n "$ac_init_help"; then
|
|
case $ac_init_help in
|
|
- short | recursive ) echo "Configuration of ld 2.40.00:";;
|
|
+ short | recursive ) echo "Configuration of ld 2.40:";;
|
|
esac
|
|
cat <<\_ACEOF
|
|
|
|
@@ -1661,7 +1661,7 @@ fi
|
|
test -n "$ac_init_help" && exit $ac_status
|
|
if $ac_init_version; then
|
|
cat <<\_ACEOF
|
|
-ld configure 2.40.00
|
|
+ld configure 2.40
|
|
generated by GNU Autoconf 2.69
|
|
|
|
Copyright (C) 2012 Free Software Foundation, Inc.
|
|
@@ -2376,7 +2376,7 @@ cat >config.log <<_ACEOF
|
|
This file contains any messages produced by compilers while
|
|
running configure, to aid debugging if configure makes a mistake.
|
|
|
|
-It was created by ld $as_me 2.40.00, which was
|
|
+It was created by ld $as_me 2.40, which was
|
|
generated by GNU Autoconf 2.69. Invocation command line was
|
|
|
|
$ $0 $@
|
|
@@ -3359,7 +3359,7 @@ fi
|
|
|
|
# Define the identity of the package.
|
|
PACKAGE='ld'
|
|
- VERSION='2.40.00'
|
|
+ VERSION='2.40'
|
|
|
|
|
|
cat >>confdefs.h <<_ACEOF
|
|
@@ -18083,7 +18083,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_wri
|
|
# report actual input values of CONFIG_FILES etc. instead of their
|
|
# values after options handling.
|
|
ac_log="
|
|
-This file was extended by ld $as_me 2.40.00, which was
|
|
+This file was extended by ld $as_me 2.40, which was
|
|
generated by GNU Autoconf 2.69. Invocation command line was
|
|
|
|
CONFIG_FILES = $CONFIG_FILES
|
|
@@ -18149,7 +18149,7 @@ _ACEOF
|
|
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
|
|
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
|
|
ac_cs_version="\\
|
|
-ld config.status 2.40.00
|
|
+ld config.status 2.40
|
|
configured by $0, generated by GNU Autoconf 2.69,
|
|
with options \\"\$ac_cs_config\\"
|
|
|