From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 7530F158086 for ; Sat, 8 Jan 2022 03:49:34 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 891A22BC00A; Sat, 8 Jan 2022 03:49:27 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 5F7EBE0788 for ; Sat, 8 Jan 2022 03:49:24 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B22FD342E23 for ; Sat, 8 Jan 2022 03:49:23 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 32903287 for ; Sat, 8 Jan 2022 03:49:22 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1641612431.8dd1f1f8da62dec0b001f9831c37d291e8e5821a.sam@gentoo> Subject: [gentoo-commits] proj/gcc-patches:master commit in: / X-VCS-Repository: proj/gcc-patches X-VCS-Files: make-tarball.sh X-VCS-Directories: / X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 8dd1f1f8da62dec0b001f9831c37d291e8e5821a X-VCS-Branch: master Date: Sat, 8 Jan 2022 03:49:22 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: dbb11054-f34b-49e1-b69c-b87cfe50dc10 X-Archives-Hash: 4abb2c02fe7c11e1d30836fcd207aebc commit: 8dd1f1f8da62dec0b001f9831c37d291e8e5821a Author: Sam James gentoo org> AuthorDate: Sat Jan 8 03:27:03 2022 +0000 Commit: Sam James gentoo 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 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 ; }