| 1 |
commit: 8dd1f1f8da62dec0b001f9831c37d291e8e5821a |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Jan 8 03:27:03 2022 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Jan 8 03:27:11 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/gcc-patches.git/commit/?id=8dd1f1f8 |
| 7 |
|
| 8 |
make-tarball.sh: support musl patchsets (and drop uclibc) |
| 9 |
|
| 10 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 11 |
|
| 12 |
make-tarball.sh | 14 +++++++------- |
| 13 |
1 file changed, 7 insertions(+), 7 deletions(-) |
| 14 |
|
| 15 |
diff --git a/make-tarball.sh b/make-tarball.sh |
| 16 |
index bf61b4e..a14f291 100755 |
| 17 |
--- a/make-tarball.sh |
| 18 |
+++ b/make-tarball.sh |
| 19 |
@@ -40,7 +40,7 @@ eread() { |
| 20 |
shift |
| 21 |
done |
| 22 |
} |
| 23 |
-eread UCLIBC_VER PP_VER HTB_VER HTB_GCC_VER MAN_VER SPECS_VER SPECS_GCC_VER |
| 24 |
+eread MUSL_VER PP_VER HTB_VER HTB_GCC_VER MAN_VER SPECS_VER SPECS_GCC_VER |
| 25 |
[[ -n ${HTB_VER} && -z ${HTB_GCC_VER} ]] && HTB_GCC_VER=${gver} |
| 26 |
PATCH_VER=$(awk '{print $1; exit}' ./${gver}/gentoo/README.history) |
| 27 |
PIE_VER=$(awk '{print $1; exit}' ./${gver}/pie/README.history) |
| 28 |
@@ -52,7 +52,7 @@ fi |
| 29 |
|
| 30 |
echo "Building patches for gcc version ${gver}" |
| 31 |
echo " - PATCH: ${PATCH_VER} (taken from ${gver}/gentoo/README.history)" |
| 32 |
-echo " - UCLIBC: ${UCLIBC_VER}" |
| 33 |
+echo " - MUSL: ${MUSL_VER}" |
| 34 |
echo " - PIE: ${PIE_VER} (taken from ${gver}/pie/README.history)" |
| 35 |
echo " - SPECS: ${SPECS_VER} (${SPECS_GCC_VER:-${gver}})" |
| 36 |
echo " - SSP: ${PP_VER}" |
| 37 |
@@ -63,10 +63,10 @@ rm -rf tmp |
| 38 |
rm -f gcc-${gver}-*.tar.bz2 |
| 39 |
|
| 40 |
# standard jobbies |
| 41 |
-mkdir -p tmp/patch/exclude tmp/uclibc tmp/piepatch tmp/specs |
| 42 |
+mkdir -p tmp/patch/exclude tmp/musl tmp/piepatch tmp/specs |
| 43 |
[[ -n ${PATCH_VER} ]] && cp ${gver}/gentoo/*.patch ${gver}/gentoo/README.history README.Gentoo.patches tmp/patch/ |
| 44 |
[[ -d ${gver}/man ]] && cp -r ${gver}/man tmp/ |
| 45 |
-[[ -n ${UCLIBC_VER} ]] && cp -r ${gver}/uclibc/* README.Gentoo.patches tmp/uclibc/ |
| 46 |
+[[ -n ${MUSL_VER} ]] && cp -r ${gver}/musl/* README.Gentoo.patches tmp/musl/ |
| 47 |
[[ -n ${PIE_VER} ]] && cp -r ${gver}/pie/* README.Gentoo.patches tmp/piepatch/ |
| 48 |
[[ -n ${PP_VER} ]] && cp -r ${gver}/ssp tmp/ |
| 49 |
[[ -n ${SPECS_VER} ]] && cp -r ${SPECS_GCC_VER:-${gver}}/specs/* tmp/specs/ |
| 50 |
@@ -80,9 +80,9 @@ find tmp/ -name CVS -type d | xargs rm -rf |
| 51 |
[[ -n ${PATCH_VER} ]] && { |
| 52 |
tar -jcf gcc-${sgver}-patches-${PATCH_VER}.tar.bz2 \ |
| 53 |
-C tmp patch || exit 1 ; } |
| 54 |
-[[ -n ${UCLIBC_VER} ]] && { |
| 55 |
-tar -jcf gcc-${sgver}-uclibc-patches-${UCLIBC_VER}.tar.bz2 \ |
| 56 |
- -C tmp uclibc || exit 1 ; } |
| 57 |
+[[ -n ${MUSL_VER} ]] && { |
| 58 |
+tar -jcf gcc-${sgver}-musl-patches-${MUSL_VER}.tar.bz2 \ |
| 59 |
+ -C tmp musl || exit 1 ; } |
| 60 |
[[ -n ${PIE_VER} ]] && { |
| 61 |
tar -jcf gcc-${sgver}-piepatches-v${PIE_VER}.tar.bz2 \ |
| 62 |
-C tmp piepatch || exit 1 ; } |
Archives