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

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

[Sergei Trofimovich]

commit:     b654aa4de0ada0b5a9455a7820331ffcad69fa50
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Wed Aug  8 07:53:34 2018 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Wed Aug  8 07:53:34 2018 +0000
URL:        https://gitweb.gentoo.org/proj/gcc-patches.git/commit/?id=b654aa4d

README.Gentoo.patches: update to git location

Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 README.Gentoo.patches | 17 ++++-------------
 1 file changed, 4 insertions(+), 13 deletions(-)

diff --git a/README.Gentoo.patches b/README.Gentoo.patches
index 615f729..0463ad7 100644
--- a/README.Gentoo.patches
+++ b/README.Gentoo.patches
@@ -9,24 +9,15 @@ patches into a tarball and distribute it via our public mirroring system.
 If you want specific info about a patch (like wtf it does or whose great idea 
 it was to change the code), read the patch !  We try to fill out the top of 
 them with useful info such as what it does, why it's needed, bug reports, 
-original creators, etc...  For simple patches, we reserve the right to assume 
-your IQ is greater than absolute 0 and figure out what it does w/out an 
-explanation.  If, by some miracle of science, it falls below the absolute 0 
-mark, you should help mankind by finding some scientists and letting them 
-probe you with their ... erm ... probes.
+original creators, etc.
 
  =================
  === W[here]TF ===
  =================
 
-For those with CVS access, you want the 'src/patchsets' dir inside of the 
-'gentoo' cvs module.
-
-For those w/out CVS access, this URL should help you:
-http://sources.gentoo.org/gentoo/src/patchsets/
- (you can also find anon cvs access there too)
-
-It should be pretty easy to find your way around, you're a big boy after all.
+gitweb: https://gitweb.gentoo.org/proj/gcc-patches.git/
+read-only git tree: https://anongit.gentoo.org/git/proj/gcc-patches.git
+read-write git tree: git+ssh://git@git.gentoo.org/proj/gcc-patches.git
 
  ===============
  === H[ow]TF ===

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

[Sergei Trofimovich]

commit:     511a79b9e1266603fdebbeb15287627d9240db2c
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 15 19:59:21 2020 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sat Feb 15 19:59:21 2020 +0000
URL:        https://gitweb.gentoo.org/proj/gcc-patches.git/commit/?id=511a79b9

make-tarball.sh: tweak scrip to work on non-empty EPREFIX

Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 make-tarball.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/make-tarball.sh b/make-tarball.sh
index 082da40..a626a3d 100755
--- a/make-tarball.sh
+++ b/make-tarball.sh
@@ -9,7 +9,7 @@ ver=${1%/}
 for ebuild in \
 	${ver} \
 	/usr/local/src/gentoo/repo/gentoo/sys-devel/gcc/gcc-${ver}.ebuild \
-	"$(portageq get_repo_path / gentoo)"/sys-devel/gcc/gcc-${ver}.ebuild \
+	"$(portageq get_repo_path $(portageq envvar EPREFIX)/ gentoo)"/sys-devel/gcc/gcc-${ver}.ebuild \
 	/usr/portage/sys-devel/gcc/gcc-${ver}.ebuild \
 	""
 do

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

[Sergei Trofimovich]

commit:     404cdc26b8b203b7a1910be73f256a05a1e64b18
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Thu May 28 23:04:35 2020 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Thu May 28 23:04:35 2020 +0000
URL:        https://gitweb.gentoo.org/proj/gcc-patches.git/commit/?id=404cdc26

make-tarball.sh: add patchset creation against live ebuilds

Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 make-tarball.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/make-tarball.sh b/make-tarball.sh
index a626a3d..18dfe47 100755
--- a/make-tarball.sh
+++ b/make-tarball.sh
@@ -25,6 +25,7 @@ rm -f ${digest/gcc\//gcc\/files\/digest-}
 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
 
 # trim branch update number
 sgver=$(echo ${gver} | sed -e 's:[0-9]::g')

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

[Sergei Trofimovich]

commit:     f39b46b17fbd8fb122db4ca23bebc3f4b4c23e23
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 30 17:25:09 2020 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Wed Dec 30 17:25:09 2020 +0000
URL:        https://gitweb.gentoo.org/proj/gcc-patches.git/commit/?id=f39b46b1

make-tarball.sh: package README.history as well

This should make it slightly easier to see what was added
in each patchset.

Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 make-tarball.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/make-tarball.sh b/make-tarball.sh
index 18dfe47..bf61b4e 100755
--- a/make-tarball.sh
+++ b/make-tarball.sh
@@ -64,7 +64,7 @@ rm -f gcc-${gver}-*.tar.bz2
 
 # standard jobbies
 mkdir -p tmp/patch/exclude tmp/uclibc tmp/piepatch tmp/specs
-[[ -n ${PATCH_VER}  ]] && cp ${gver}/gentoo/*.patch README.Gentoo.patches tmp/patch/
+[[ -n ${PATCH_VER}  ]] && cp ${gver}/gentoo/*.patch ${gver}/gentoo/README.history README.Gentoo.patches tmp/patch/
 [[ -d ${gver}/man   ]] && cp -r ${gver}/man tmp/
 [[ -n ${UCLIBC_VER} ]] && cp -r ${gver}/uclibc/* README.Gentoo.patches tmp/uclibc/
 [[ -n ${PIE_VER}    ]] && cp -r ${gver}/pie/* README.Gentoo.patches tmp/piepatch/

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

[Sam James]

commit:     8dd1f1f8da62dec0b001f9831c37d291e8e5821a
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Jan  8 03:27:03 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Jan  8 03:27:11 2022 +0000
URL:        https://gitweb.gentoo.org/proj/gcc-patches.git/commit/?id=8dd1f1f8

make-tarball.sh: support musl patchsets (and drop uclibc)

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

 make-tarball.sh | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/make-tarball.sh b/make-tarball.sh
index bf61b4e..a14f291 100755
--- a/make-tarball.sh
+++ b/make-tarball.sh
@@ -40,7 +40,7 @@ eread() {
 		shift
 	done
 }
-eread UCLIBC_VER PP_VER HTB_VER HTB_GCC_VER MAN_VER SPECS_VER SPECS_GCC_VER
+eread MUSL_VER PP_VER HTB_VER HTB_GCC_VER MAN_VER SPECS_VER SPECS_GCC_VER
 [[ -n ${HTB_VER} && -z ${HTB_GCC_VER} ]] && HTB_GCC_VER=${gver}
 PATCH_VER=$(awk '{print $1; exit}' ./${gver}/gentoo/README.history)
 PIE_VER=$(awk '{print $1; exit}' ./${gver}/pie/README.history)
@@ -52,7 +52,7 @@ fi
 
 echo "Building patches for gcc version ${gver}"
 echo " - PATCH:    ${PATCH_VER} (taken from ${gver}/gentoo/README.history)"
-echo " - UCLIBC:   ${UCLIBC_VER}"
+echo " - MUSL:     ${MUSL_VER}"
 echo " - PIE:      ${PIE_VER} (taken from ${gver}/pie/README.history)"
 echo " - SPECS:    ${SPECS_VER} (${SPECS_GCC_VER:-${gver}})"
 echo " - SSP:      ${PP_VER}"
@@ -63,10 +63,10 @@ rm -rf tmp
 rm -f gcc-${gver}-*.tar.bz2
 
 # standard jobbies
-mkdir -p tmp/patch/exclude tmp/uclibc tmp/piepatch tmp/specs
+mkdir -p tmp/patch/exclude tmp/musl tmp/piepatch tmp/specs
 [[ -n ${PATCH_VER}  ]] && cp ${gver}/gentoo/*.patch ${gver}/gentoo/README.history README.Gentoo.patches tmp/patch/
 [[ -d ${gver}/man   ]] && cp -r ${gver}/man tmp/
-[[ -n ${UCLIBC_VER} ]] && cp -r ${gver}/uclibc/* README.Gentoo.patches tmp/uclibc/
+[[ -n ${MUSL_VER} ]] && cp -r ${gver}/musl/* README.Gentoo.patches tmp/musl/
 [[ -n ${PIE_VER}    ]] && cp -r ${gver}/pie/* README.Gentoo.patches tmp/piepatch/
 [[ -n ${PP_VER}     ]] && cp -r ${gver}/ssp tmp/
 [[ -n ${SPECS_VER}  ]] && cp -r ${SPECS_GCC_VER:-${gver}}/specs/* tmp/specs/
@@ -80,9 +80,9 @@ find tmp/ -name CVS -type d | xargs rm -rf
 [[ -n ${PATCH_VER}  ]] && {
 tar -jcf gcc-${sgver}-patches-${PATCH_VER}.tar.bz2 \
 	-C tmp patch || exit 1 ; }
-[[ -n ${UCLIBC_VER} ]] && {
-tar -jcf gcc-${sgver}-uclibc-patches-${UCLIBC_VER}.tar.bz2 \
-	-C tmp uclibc || exit 1 ; }
+[[ -n ${MUSL_VER} ]] && {
+tar -jcf gcc-${sgver}-musl-patches-${MUSL_VER}.tar.bz2 \
+	-C tmp musl || exit 1 ; }
 [[ -n ${PIE_VER}    ]] && {
 tar -jcf gcc-${sgver}-piepatches-v${PIE_VER}.tar.bz2 \
 	-C tmp piepatch || exit 1 ; }

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

[Sam James]

commit:     71044ab300d054f295adfbda61112d8abc8e4368
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Jan  8 03:48:16 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Jan  8 03:48:16 2022 +0000
URL:        https://gitweb.gentoo.org/proj/gcc-patches.git/commit/?id=71044ab3

README*: modernise a bit

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

 README                |  5 +++--
 README.Gentoo.patches | 12 ++++--------
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/README b/README
index 12357f1..5a5d70b 100644
--- a/README
+++ b/README
@@ -16,8 +16,9 @@ Naming
 Documention
 -----------
 All patches need a header describing what the patch does, where it came from,
-and all relevent URLs.  Read http://dev.gentoo.org/~vapier/clean-patches and
-in particular use scrub_patch() or face the wrath.
+and all relevent URLs.  Read https://dev.gentoo.org/~vapier/clean-patches (or
+https://devmanual.gentoo.org/ebuild-writing/misc-files/patches/index.html#clean-patch-howto)
+and in particular use scrub_patch() or face the wrath.
 
 Update README.history whenever you add (+), remove (-), or update (U) a patch.
 

diff --git a/README.Gentoo.patches b/README.Gentoo.patches
index 0463ad7..c6d3511 100644
--- a/README.Gentoo.patches
+++ b/README.Gentoo.patches
@@ -3,11 +3,11 @@
  ================
 
 Gentoo patchsets that have grown too large to keep on the rsync mirrors have 
-been moved to our cvs tree.  From there, we bundle up all the whee little 
+been moved to our git tree.  From there, we bundle up all the wee little 
 patches into a tarball and distribute it via our public mirroring system.
 
 If you want specific info about a patch (like wtf it does or whose great idea 
-it was to change the code), read the patch !  We try to fill out the top of 
+it was to change the code), read the patch!  We try to fill out the top of 
 them with useful info such as what it does, why it's needed, bug reports, 
 original creators, etc.
 
@@ -25,13 +25,9 @@ read-write git tree: git+ssh://git@git.gentoo.org/proj/gcc-patches.git
 
 The patch naming/applying convention might be a little confusing to the Gentoo
 outsider, so here's a quick rundown.  Patch tarballs are applied in Gentoo via
-a helper command called "epatch".  This command is pretty forgiving when it
-comes to applying patches.
+a helper command called "eapply". 
 
-For example, it will autodetect the required -p# by starting at 0 and counting
-up until things apply.  So do not expect a patch series to all be at the same -p
-level even if they all apply from the same source directory.  Typically however,
-people will use -p0 or -p1.
+Patches should use -p1.
 
 The epatch command will also use the -E option by default as the `patch` command
 can be pretty picky about removing files.  We just force the issue.  If you

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

[Sam James]

commit:     6d1ad1a2de05f8c44217177121cf324b1d30ebac
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Jan  8 03:43:27 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Jan  8 03:43:27 2022 +0000
URL:        https://gitweb.gentoo.org/proj/gcc-patches.git/commit/?id=6d1ad1a2

make-tarball.sh: support snapshot versions

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

 make-tarball.sh | 53 ++++++++++++++++++++++++++++++++++++++++++++---------
 1 file changed, 44 insertions(+), 9 deletions(-)

diff --git a/make-tarball.sh b/make-tarball.sh
index a14f291..6e7fc82 100755
--- a/make-tarball.sh
+++ b/make-tarball.sh
@@ -1,20 +1,48 @@
 #!/bin/bash
 
+find_ebuild() {
+	local ver=$1
+
+	for ebuild in \
+		${ver} \
+		/usr/local/src/gentoo/repo/gentoo/sys-devel/gcc/gcc-${ver}.ebuild \
+		"$(portageq get_repo_path $(portageq envvar EPREFIX)/ gentoo)"/sys-devel/gcc/gcc-${ver}.ebuild \
+		/usr/portage/sys-devel/gcc/gcc-${ver}.ebuild \
+		""
+	do
+		[[ -f ${ebuild} ]] && break
+	done
+
+	echo ${ebuild}
+}
+
+
 if [[ $# -ne 1 ]] ; then
 	echo "Usage: $0 <gcc ebuild>"
 	exit 1
 fi
 
 ver=${1%/}
-for ebuild in \
-	${ver} \
-	/usr/local/src/gentoo/repo/gentoo/sys-devel/gcc/gcc-${ver}.ebuild \
-	"$(portageq get_repo_path $(portageq envvar EPREFIX)/ gentoo)"/sys-devel/gcc/gcc-${ver}.ebuild \
-	/usr/portage/sys-devel/gcc/gcc-${ver}.ebuild \
-	""
-do
-	[[ -f ${ebuild} ]] && break
-done
+
+ebuild=$(find_ebuild ${ver})
+
+# If it doesn't exist, check for a snapshot version. We want to be able
+# to input e.g. '11.3.0' and fall back to '11.2.1_p2021127' if it doesn't
+# exist, as that version will become 11.3.0 anyway.
+#
+# (_p# is going to be something like gcc-11.2.1_p20211127, where gcc 11.2.1
+# will never be released (but gcc 11.2 was) and gcc 11.3 is the next release.
+# For such cases, use 11.3 as ver.)
+if [[ -z ${ebuild} ]] ; then
+	ver=${ver%%_p*}
+
+	ver_major=$(echo ${ver} | cut -d'.' -f1)
+	ver_minor=$(($(echo ${ver} | cut -d'.' -f2) - 1))
+	ver="${ver_major}.${ver_minor}.1_p*"
+
+	ebuild=$(find_ebuild ${ver})
+fi
+
 if [[ -z ${ebuild} ]] ; then
 	echo "!!! gcc ebuild '${ver}' does not exist"
 	exit 1
@@ -27,6 +55,12 @@ 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*}
+gver_major=$(echo ${gver} | cut -d'.' -f1)
+gver_minor=$(($(echo ${gver} | cut -d'.' -f2) + 1))
+gver="${gver_major}.${gver_minor}.0"
+
 # trim branch update number
 sgver=$(echo ${gver} | sed -e 's:[0-9]::g')
 [[ ${#sgver} -gt 2 ]] \
@@ -40,6 +74,7 @@ eread() {
 		shift
 	done
 }
+
 eread MUSL_VER PP_VER HTB_VER HTB_GCC_VER MAN_VER SPECS_VER SPECS_GCC_VER
 [[ -n ${HTB_VER} && -z ${HTB_GCC_VER} ]] && HTB_GCC_VER=${gver}
 PATCH_VER=$(awk '{print $1; exit}' ./${gver}/gentoo/README.history)

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

[Sam James]

commit:     7e6af77f9d31dbfa692a8efeb283799ae531b1b3
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Apr  9 03:02:03 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Apr  9 03:02:03 2022 +0000
URL:        https://gitweb.gentoo.org/proj/gcc-patches.git/commit/?id=7e6af77f

make-tarball.sh: use xz

We're doing it everywhere else, so why not?

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

 make-tarball.sh | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/make-tarball.sh b/make-tarball.sh
index 6e7fc82..fa59a44 100755
--- a/make-tarball.sh
+++ b/make-tarball.sh
@@ -95,7 +95,7 @@ echo " - BOUNDS:   ${HTB_GCC_VER}-${HTB_VER}"
 echo " - MAN:      ${MAN_VER}"
 
 rm -rf tmp
-rm -f gcc-${gver}-*.tar.bz2
+rm -f gcc-${gver}-*.tar.bz2 gcc-${gver}-*.tar.xz
 
 # standard jobbies
 mkdir -p tmp/patch/exclude tmp/musl tmp/piepatch tmp/specs
@@ -113,28 +113,28 @@ find tmp/ -name CVS -type d | xargs rm -rf
 
 # standard jobbies
 [[ -n ${PATCH_VER}  ]] && {
-tar -jcf gcc-${sgver}-patches-${PATCH_VER}.tar.bz2 \
+tar -jcf gcc-${sgver}-patches-${PATCH_VER}.tar.xz \
 	-C tmp patch || exit 1 ; }
 [[ -n ${MUSL_VER} ]] && {
-tar -jcf gcc-${sgver}-musl-patches-${MUSL_VER}.tar.bz2 \
+tar -jcf gcc-${sgver}-musl-patches-${MUSL_VER}.tar.xz \
 	-C tmp musl || exit 1 ; }
 [[ -n ${PIE_VER}    ]] && {
-tar -jcf gcc-${sgver}-piepatches-v${PIE_VER}.tar.bz2 \
+tar -jcf gcc-${sgver}-piepatches-v${PIE_VER}.tar.xz \
 	-C tmp piepatch || exit 1 ; }
 [[ -n ${SPECS_VER}  ]] && {
-tar -jcf gcc-${sgver}-specs-${SPECS_VER}.tar.bz2 \
+tar -jcf gcc-${sgver}-specs-${SPECS_VER}.tar.xz \
 	-C tmp specs || exit 1 ; }
 [[ -n ${PP_VER}     ]] && {
 mv tmp/ssp/protector.patch tmp/ssp/gcc-${gver}-ssp.patch
-tar -jcf gcc-${gver}-ssp-${PP_VER}.tar.bz2 \
+tar -jcf gcc-${gver}-ssp-${PP_VER}.tar.xz \
 	-C tmp ssp || exit 1 ; }
 [[ -d ${gver}/man   ]] && {
-tar -jcf gcc-${MAN_VER}-manpages.tar.bz2 \
+tar -jcf gcc-${MAN_VER}-manpages.tar.xz \
 	-C tmp/man . || exit 1 ; }
 # extra cruft
 [[ -n ${HTB_VER}    ]] && {
-bzip2 tmp/bounds-checking-*.patch \
-	&& cp tmp/bounds-checking-*.patch.bz2 . || exit 1 ; }
+xz tmp/bounds-checking-*.patch \
+	&& cp tmp/bounds-checking-*.patch.xz . || exit 1 ; }
 rm -rf tmp
 
-du -b *.bz2
+du -b *.xz

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

[Sam James]

commit:     26c57df5469813c897b8c7d34a969a3dc483e019
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 10 11:37:20 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Apr 10 11:37:20 2022 +0000
URL:        https://gitweb.gentoo.org/proj/gcc-patches.git/commit/?id=26c57df5

make-tarball.sh: just use -a to tar

This is what I'd really meant to do the other day for .xz;
let tar autodetect based on extension.

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

 make-tarball.sh | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/make-tarball.sh b/make-tarball.sh
index 94035e3..1d08c02 100755
--- a/make-tarball.sh
+++ b/make-tarball.sh
@@ -113,23 +113,23 @@ find tmp/ -name CVS -type d | xargs rm -rf
 
 # standard jobbies
 [[ -n ${PATCH_VER}  ]] && {
-tar -Jcf gcc-${sgver}-patches-${PATCH_VER}.tar.xz \
+tar -acf gcc-${sgver}-patches-${PATCH_VER}.tar.xz \
 	-C tmp patch || exit 1 ; }
 [[ -n ${MUSL_VER} ]] && {
-tar -Jcf gcc-${sgver}-musl-patches-${MUSL_VER}.tar.xz \
+tar -acf gcc-${sgver}-musl-patches-${MUSL_VER}.tar.xz \
 	-C tmp musl || exit 1 ; }
 [[ -n ${PIE_VER}    ]] && {
-tar -Jcf gcc-${sgver}-piepatches-v${PIE_VER}.tar.xz \
+tar -acf gcc-${sgver}-piepatches-v${PIE_VER}.tar.xz \
 	-C tmp piepatch || exit 1 ; }
 [[ -n ${SPECS_VER}  ]] && {
-tar -Jcf gcc-${sgver}-specs-${SPECS_VER}.tar.xz \
+tar -acf gcc-${sgver}-specs-${SPECS_VER}.tar.xz \
 	-C tmp specs || exit 1 ; }
 [[ -n ${PP_VER}     ]] && {
 mv tmp/ssp/protector.patch tmp/ssp/gcc-${gver}-ssp.patch
-tar -Jcf gcc-${gver}-ssp-${PP_VER}.tar.xz \
+tar -acf gcc-${gver}-ssp-${PP_VER}.tar.xz \
 	-C tmp ssp || exit 1 ; }
 [[ -d ${gver}/man   ]] && {
-tar -Jcf gcc-${MAN_VER}-manpages.tar.xz \
+tar -acf gcc-${MAN_VER}-manpages.tar.xz \
 	-C tmp/man . || exit 1 ; }
 # extra cruft
 [[ -n ${HTB_VER}    ]] && {

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

[Sam James]

commit:     4bb7a1d01981115f06301761fe436cea9dd4ceb7
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 10 11:36:38 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Apr 10 11:36:38 2022 +0000
URL:        https://gitweb.gentoo.org/proj/gcc-patches.git/commit/?id=4bb7a1d0

make-tarball.sh: really use .xz

Was too tired doing this. -j -> -J.

Fixes: 7e6af77f9d31dbfa692a8efeb283799ae531b1b3
Reported-by: Fabian Groffen <grobian <AT> gentoo.org>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 make-tarball.sh | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/make-tarball.sh b/make-tarball.sh
index fa59a44..94035e3 100755
--- a/make-tarball.sh
+++ b/make-tarball.sh
@@ -113,23 +113,23 @@ find tmp/ -name CVS -type d | xargs rm -rf
 
 # standard jobbies
 [[ -n ${PATCH_VER}  ]] && {
-tar -jcf gcc-${sgver}-patches-${PATCH_VER}.tar.xz \
+tar -Jcf gcc-${sgver}-patches-${PATCH_VER}.tar.xz \
 	-C tmp patch || exit 1 ; }
 [[ -n ${MUSL_VER} ]] && {
-tar -jcf gcc-${sgver}-musl-patches-${MUSL_VER}.tar.xz \
+tar -Jcf gcc-${sgver}-musl-patches-${MUSL_VER}.tar.xz \
 	-C tmp musl || exit 1 ; }
 [[ -n ${PIE_VER}    ]] && {
-tar -jcf gcc-${sgver}-piepatches-v${PIE_VER}.tar.xz \
+tar -Jcf gcc-${sgver}-piepatches-v${PIE_VER}.tar.xz \
 	-C tmp piepatch || exit 1 ; }
 [[ -n ${SPECS_VER}  ]] && {
-tar -jcf gcc-${sgver}-specs-${SPECS_VER}.tar.xz \
+tar -Jcf gcc-${sgver}-specs-${SPECS_VER}.tar.xz \
 	-C tmp specs || exit 1 ; }
 [[ -n ${PP_VER}     ]] && {
 mv tmp/ssp/protector.patch tmp/ssp/gcc-${gver}-ssp.patch
-tar -jcf gcc-${gver}-ssp-${PP_VER}.tar.xz \
+tar -Jcf gcc-${gver}-ssp-${PP_VER}.tar.xz \
 	-C tmp ssp || exit 1 ; }
 [[ -d ${gver}/man   ]] && {
-tar -jcf gcc-${MAN_VER}-manpages.tar.xz \
+tar -Jcf gcc-${MAN_VER}-manpages.tar.xz \
 	-C tmp/man . || exit 1 ; }
 # extra cruft
 [[ -n ${HTB_VER}    ]] && {

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

[Sam James]

commit:     e035fdade4b4f74815a237fba122240f2a4d547c
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 25 00:57:44 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Apr 25 01:12:05 2022 +0000
URL:        https://gitweb.gentoo.org/proj/gcc-patches.git/commit/?id=e035fdad

make-tarball.sh: add ~/git/gentoo to search paths

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

 make-tarball.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/make-tarball.sh b/make-tarball.sh
index 5a8dd77..e76e37f 100755
--- a/make-tarball.sh
+++ b/make-tarball.sh
@@ -6,6 +6,7 @@ find_ebuild() {
 
 	for ebuild in \
 		${ver} \
+		~/git/gentoo/sys-devel/gcc/gcc-${ver}.ebuild \
 		/usr/local/src/gentoo/repo/gentoo/sys-devel/gcc/gcc-${ver}.ebuild \
 		"$(portageq get_repo_path $(portageq envvar EPREFIX)/ gentoo)"/sys-devel/gcc/gcc-${ver}.ebuild \
 		/usr/portage/sys-devel/gcc/gcc-${ver}.ebuild \

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

[Sam James]

commit:     c5d97099620c2e6cfef5ed953cc71e9d61c620bd
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun May 22 21:28:56 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun May 22 23:16:40 2022 +0000
URL:        https://gitweb.gentoo.org/proj/gcc-patches.git/commit/?id=c5d97099

make-tarball.sh: more version fixups

- When falling back to _p, don't be clobbered by previous _pre logic
- Fix typo in index
- Later on, when figuring out gver, don't subtract twice
- Sync gver logic with earlier chunks too

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

 make-tarball.sh | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/make-tarball.sh b/make-tarball.sh
index e76e37f..06e1216 100755
--- a/make-tarball.sh
+++ b/make-tarball.sh
@@ -25,6 +25,7 @@ if [[ $# -ne 1 ]] ; then
 fi
 
 ver=${1%/}
+orig_ver=${ver}
 
 ebuild=$(find_ebuild ${ver})
 
@@ -49,10 +50,11 @@ if [[ -z ${ebuild} ]] ; then
 fi
 
 if [[ -z ${ebuild} ]] ; then
+	ver=${orig_ver}
 	ver=${ver%%_p*}
 
 	ver_major=$(echo ${ver} | cut -d'.' -f1)
-	ver_minor=$(($(echo ${ver} | cut -d'.' -f3) - 1))
+	ver_minor=$(($(echo ${ver} | cut -d'.' -f2) - 1))
 	ver="${ver_major}.${ver_minor}.1_p*"
 
 	ebuild=$(find_ebuild ${ver})
@@ -80,7 +82,7 @@ if [[ ${had_pre} -eq 1 ]] ; then
 	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'.' -f3) - 1))
+	gver_minor=$(($(echo ${gver} | cut -d'.' -f2) + 1))
 	gver="${gver_major}.${gver_minor}.0"
 fi
 

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

[Sam James]

commit:     8ef7da29b7a3a97423a88ffe2c893e8d633b335a
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 27 16:23:19 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Aug 27 16:23:19 2022 +0000
URL:        https://gitweb.gentoo.org/proj/gcc-patches.git/commit/?id=8ef7da29

make-tarball.sh: set XZ_OPT

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

 make-tarball.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/make-tarball.sh b/make-tarball.sh
index 06e1216..fe7439f 100755
--- a/make-tarball.sh
+++ b/make-tarball.sh
@@ -1,6 +1,9 @@
 #!/bin/bash
 #set -x
 
+XZ_OPT=${XZ_OPT-"-T0 -9"}
+export XZ_OPT
+
 find_ebuild() {
 	local ver=$1
 

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

[Sam James]

commit:     3533400bc3eccdd0c6ecbc63f977cfbe27dd4d1e
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 27 16:23:37 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Aug 27 16:23:37 2022 +0000
URL:        https://gitweb.gentoo.org/proj/gcc-patches.git/commit/?id=3533400b

make-tarball.sh: use /usr/bin/env bash shebang

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

 make-tarball.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/make-tarball.sh b/make-tarball.sh
index fe7439f..7ded1f1 100755
--- a/make-tarball.sh
+++ b/make-tarball.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #set -x
 
 XZ_OPT=${XZ_OPT-"-T0 -9"}