commit: e3bcf6051d3137b049fc2bf3c229bd6b6d44f661
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 1 22:02:09 2025 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Oct 1 22:03:09 2025 +0000
URL: https://gitweb.gentoo.org/proj/gcc-patches.git/commit/?id=e3bcf605
11.5.0: add musl README.history
Was missing before?
Signed-off-by: Sam James <sam <AT> gentoo.org>
11.5.0/musl/README.history | 7 +++++++
make-tarball.sh | 32 ++++++++++++++++++++++++++++----
2 files changed, 35 insertions(+), 4 deletions(-)
diff --git a/11.5.0/musl/README.history b/11.5.0/musl/README.history
new file mode 100644
index 0000000..3aa1ffd
--- /dev/null
+++ b/11.5.0/musl/README.history
@@ -0,0 +1,7 @@
+4 1 October 2025
+
+ + 25_all_multilib_pure64.patch
+ + 50_all_calloc_libgccjit.patch
+ + 50_all_libdruntime_32bit.patch
+ + 50_all_libssp_unconditionally.patch
+ + 50_all_posix_memalign.patch
diff --git a/make-tarball.sh b/make-tarball.sh
index 79fc348..aed8b7b 100755
--- a/make-tarball.sh
+++ b/make-tarball.sh
@@ -1,5 +1,5 @@
#!/usr/bin/env bash
-
+set -x
XZ_OPT=${XZ_OPT-"-T0"}
export XZ_OPT
@@ -46,6 +46,8 @@ if [[ -z ${ebuild} ]] ; then
ver_major=$(echo ${ver} | cut -d'.' -f1)
ver_minor=$(($(echo ${ver} | cut -d'.' -f2) - 1))
+ [[ ${ver_minor} -lt 0 ]] && ver_minor=0
+
ver="${ver_major}.${ver_minor}.1_pre*"
ebuild=$(find_ebuild ${ver})
@@ -57,6 +59,8 @@ if [[ -z ${ebuild} ]] ; then
ver_major=$(echo ${ver} | cut -d'.' -f1)
ver_minor=$(($(echo ${ver} | cut -d'.' -f2) - 1))
+ [[ ${ver_minor} -lt 0 ]] && ver_minor=0
+
ver="${ver_major}.${ver_minor}.0_pre*"
ebuild=$(find_ebuild ${ver})
@@ -69,6 +73,9 @@ if [[ -z ${ebuild} ]] ; then
ver_major=$(echo ${ver} | cut -d'.' -f1)
ver_minor=$(($(echo ${ver} | cut -d'.' -f2) - 1))
+ [[ ${ver_minor} -lt 0 ]] && ver_minor=0
+
+ #ver="${ver_major}.${ver_minor}.9999*"
ver="${ver_major}.${ver_minor}.1_p*"
ebuild=$(find_ebuild ${ver})
@@ -76,6 +83,23 @@ if [[ -z ${ebuild} ]] ; then
[[ -n ${ebuild} ]] && had_p=1
fi
+if [[ -z ${ebuild} ]] ; then
+ ver=${orig_ver}
+ ver=${ver%%_p*}
+
+ ver_major=$(echo ${ver} | cut -d'.' -f1)
+ ver_minor=$(($(echo ${ver} | cut -d'.' -f2) - 1))
+ [[ ${ver_minor} -lt 0 ]] && ver_minor=0
+
+ #ver="${ver_major}.${ver_minor}.9999*"
+ ver="${ver_major}.${ver_minor}.0_p*"
+
+ ebuild=$(find_ebuild ${ver})
+
+ [[ -n ${ebuild} ]] && had_p=1
+fi
+
+
if [[ -z ${ebuild} ]] ; then
echo "!!! gcc ebuild '${ver}' does not exist"
exit 1
@@ -87,16 +111,16 @@ gver=${ebuild##*/gcc/gcc-} # trim leading path
gver=${gver%%.ebuild} # trim post .ebuild
gver=${gver%%-*} # trim any -r#'s
gver=${gver%%_pre*} # trim any _pre.*#'s
-
# We use the same logic as finding the ebuild above for snapshots too
gver=${gver%%_p*}
+
if [[ ${had_pre} -eq 1 ]] ; then
gver_major=$(echo ${gver} | cut -d'.' -f1)
- gver_minor=$(($(echo ${gver} | cut -d'.' -f2) + 1))
+ gver_minor=$(($(echo ${gver} | cut -d'.' -f2) ))
gver="${gver_major}.${gver_minor}.0"
elif [[ ${had_p} -eq 1 ]] ; then
gver_major=$(echo ${gver} | cut -d'.' -f1)
- gver_minor=$(($(echo ${gver} | cut -d'.' -f2) + 1))
+ gver_minor=$(($(echo ${gver} | cut -d'.' -f2)))
gver="${gver_major}.${gver_minor}.0"
fi
