diff options
| author |   Ulrich Müller <ulm@gentoo.org> | 2024-04-23 21:47:21 +0200 |
|---|---|---|
| committer | Ulrich Müller <ulm@gentoo.org> | 2024-04-23 21:47:21 +0200 |
| commit | d844a2770af0f7ea9de097401f81c0b5e8282ee4 (patch) | |
| tree | ffc1fd5ad5ee8a5aa90da9daa81b59c34d730d39 | |
| parent | 26.3, 27.2, 28.2, 29.3: Compatibility fix for autoconf-2.72 (diff) | |
| download | emacs-patches-d844a2770af0f7ea9de097401f81c0b5e8282ee4.tar.gz emacs-patches-d844a2770af0f7ea9de097401f81c0b5e8282ee4.tar.bz2 emacs-patches-d844a2770af0f7ea9de097401f81c0b5e8282ee4.zip | |
26.3, 27.2, 28.2, 29.3: Fix build with mkshemacs-29.3-patches-2emacs-28.2-patches-7emacs-27.2-patches-9emacs-26.3-patches-8
Bug: https://bugs.gentoo.org/930086
Signed-off-by: Ulrich Müller <ulm@gentoo.org>
| -rw-r--r-- | emacs/26.3/10_all_make-info-dir.patch | 29 | ||||
| -rw-r--r-- | emacs/27.2/12_all_make-info-dir.patch | 29 | ||||
| -rw-r--r-- | emacs/29.3/04_all_make-info-dir.patch | 29 |
3 files changed, 87 insertions, 0 deletions
diff --git a/emacs/26.3/10_all_make-info-dir.patch b/emacs/26.3/10_all_make-info-dir.patch new file mode 100644 index 0000000..b7b911a --- /dev/null +++ b/emacs/26.3/10_all_make-info-dir.patch @@ -0,0 +1,29 @@ +Make it build with mksh +Patch from emacs-29 branch +https://bugs.gentoo.org/930086 +https://debbugs.gnu.org/70484 + +commit 42766f95e5c0e7eb9e21db964ed93c7e093cc0b9 +Author: Ulrich Müller <ulm@gentoo.org> +Date: Tue Apr 23 07:37:17 2024 +0200 + + * build-aux/make-info-dir: Avoid bashism (bug#70484). + +--- emacs-26.3/build-aux/make-info-dir ++++ emacs-26.3/build-aux/make-info-dir +@@ -33,7 +33,8 @@ + + ## Header contains non-printing characters, so this is more + ## reliable than using awk. +-cat <"${1?}" || exit ++test $# -ge 2 || exit 1 ++cat <"$1" + shift + + exec "${AWK-awk}" ' +@@ -71,4 +72,4 @@ + if (data[dircat]) + printf "\n%s\n%s", topic[dircat], data[dircat] + } +-' "${@?}" ++' "$@" diff --git a/emacs/27.2/12_all_make-info-dir.patch b/emacs/27.2/12_all_make-info-dir.patch new file mode 100644 index 0000000..7b11313 --- /dev/null +++ b/emacs/27.2/12_all_make-info-dir.patch @@ -0,0 +1,29 @@ +Make it build with mksh +Patch from emacs-29 branch +https://bugs.gentoo.org/930086 +https://debbugs.gnu.org/70484 + +commit 42766f95e5c0e7eb9e21db964ed93c7e093cc0b9 +Author: Ulrich Müller <ulm@gentoo.org> +Date: Tue Apr 23 07:37:17 2024 +0200 + + * build-aux/make-info-dir: Avoid bashism (bug#70484). + +--- emacs-27.2/build-aux/make-info-dir ++++ emacs-27.2/build-aux/make-info-dir +@@ -33,7 +33,8 @@ + + ## Header contains non-printing characters, so this is more + ## reliable than using awk. +-cat <"${1?}" || exit ++test $# -ge 2 || exit 1 ++cat <"$1" + shift + + exec "${AWK-awk}" ' +@@ -71,4 +72,4 @@ + if (data[dircat]) + printf "\n%s\n%s", topic[dircat], data[dircat] + } +-' "${@?}" ++' "$@" diff --git a/emacs/29.3/04_all_make-info-dir.patch b/emacs/29.3/04_all_make-info-dir.patch new file mode 100644 index 0000000..9ae52c8 --- /dev/null +++ b/emacs/29.3/04_all_make-info-dir.patch @@ -0,0 +1,29 @@ +Make it build with mksh +Patch from emacs-29 branch +https://bugs.gentoo.org/930086 +https://debbugs.gnu.org/70484 + +commit 42766f95e5c0e7eb9e21db964ed93c7e093cc0b9 +Author: Ulrich Müller <ulm@gentoo.org> +Date: Tue Apr 23 07:37:17 2024 +0200 + + * build-aux/make-info-dir: Avoid bashism (bug#70484). + +--- emacs-29.3/build-aux/make-info-dir ++++ emacs-29.3/build-aux/make-info-dir +@@ -33,7 +33,8 @@ + + ## Header contains non-printing characters, so this is more + ## reliable than using awk. +-cat <"${1?}" || exit ++test $# -ge 2 || exit 1 ++cat <"$1" + shift + + exec "${AWK-awk}" ' +@@ -101,4 +102,4 @@ + if (data[dircat]) + printf "\n%s\n%s", topic[dircat], data[dircat] + } +-' "${@?}" ++' "$@" |