[gentoo-commits] proj/gcc-patches:master commit in: 13.1.0/gentoo/, /

[Sam James]

commit:     b1233aa9eb60cd10edb89ec24af8106d8d8df85f
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Nov  8 07:00:27 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Nov  8 07:47:44 2022 +0000
URL:        https://gitweb.gentoo.org/proj/gcc-patches.git/commit/?id=b1233aa9

make-tarball.sh: tweak again for 13

Signed-off-by: Sam James <sam <AT> gentoo.org>

 13.1.0/gentoo/README.history | 24 ++++++++++++++++++++++++
 make-tarball.sh              | 15 +++++++++++++--
 2 files changed, 37 insertions(+), 2 deletions(-)

diff --git a/13.1.0/gentoo/README.history b/13.1.0/gentoo/README.history
index e69de29..6c79f5f 100644
--- a/13.1.0/gentoo/README.history
+++ b/13.1.0/gentoo/README.history
@@ -0,0 +1,24 @@
+2	8 November 2022
+	- 12_all_disable-systemtap-switch.patch
+
+1	7 August 2022
+
+	+ 01_all_default-fortify-source.patch
+	+ 02_all_default-warn-format-security.patch
+	+ 03_all_default-warn-trampolines.patch
+	+ 04_all_nossp-on-nostdlib.patch
+	+ 05_all_alpha-mieee-default.patch
+	+ 06_all_ia64_note.GNU-stack.patch
+	+ 07_all_libiberty-asprintf.patch
+	+ 08_all_libiberty-pic.patch
+	+ 09_all_nopie-all-flags.patch
+	+ 10_all_sh-drop-sysroot-suffix.patch
+	+ 11_all_ia64-TEXTREL.patch
+	+ 12_all_disable-systemtap-switch.patch
+	+ 14_all_respect-build-cxxflags.patch
+	+ 20_all_libstdcxx-no-vtv.patch
+	+ 22_all_default_ssp-buffer-size.patch
+	+ 23_all_EXTRA_OPTIONS-z-now.patch
+	+ 24_all_EXTRA_OPTIONS-fstack-clash-protection.patch
+	+ 25_all_lto-intl-workaround-PR95194.patch
+	+ 26_all_enable-cet.patch

diff --git a/make-tarball.sh b/make-tarball.sh
index 7ded1f1..79fc348 100755
--- a/make-tarball.sh
+++ b/make-tarball.sh
@@ -1,7 +1,6 @@
 #!/usr/bin/env bash
-#set -x
 
-XZ_OPT=${XZ_OPT-"-T0 -9"}
+XZ_OPT=${XZ_OPT-"-T0"}
 export XZ_OPT
 
 find_ebuild() {
@@ -41,6 +40,7 @@ ebuild=$(find_ebuild ${ver})
 # For such cases, use 11.3 as ver.)
 had_pre=0
 had_p=0
+
 if [[ -z ${ebuild} ]] ; then
 	ver=${ver%%_pre*}
 
@@ -52,6 +52,17 @@ if [[ -z ${ebuild} ]] ; then
 	[[ -n ${ebuild} ]] && had_pre=1
 fi
 
+if [[ -z ${ebuild} ]] ; then
+	ver=${orig_ver%%_p*}
+
+	ver_major=$(echo ${ver} | cut -d'.' -f1)
+	ver_minor=$(($(echo ${ver} | cut -d'.' -f2) - 1))
+	ver="${ver_major}.${ver_minor}.0_pre*"
+	ebuild=$(find_ebuild ${ver})
+
+	[[ -n ${ebuild} ]] && had_p=1
+fi
+
 if [[ -z ${ebuild} ]] ; then
 	ver=${orig_ver}
 	ver=${ver%%_p*}