diff options
| author |   Ryan Hill <rhill@gentoo.org> | 2010-10-17 10:23:21 +0000 |
|---|---|---|
| committer | Ryan Hill <rhill@gentoo.org> | 2010-10-17 10:23:21 +0000 |
| commit | 5a4b50092d318815ff89eed11c8cf8bf17b0d3a5 (patch) | |
| tree | 03a0fd05081911b318f95396748f9618d1966249 /make-tarball.sh | |
| parent | Revert previous commit. (diff) | |
| download | gcc-patches-5a4b50092d318815ff89eed11c8cf8bf17b0d3a5.tar.gz gcc-patches-5a4b50092d318815ff89eed11c8cf8bf17b0d3a5.tar.bz2 gcc-patches-5a4b50092d318815ff89eed11c8cf8bf17b0d3a5.zip | |
Use SPECS_GCC_VER to find the spec patches so we aren't creating empty distfiles.
Diffstat (limited to 'make-tarball.sh')
| -rwxr-xr-x | make-tarball.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/make-tarball.sh b/make-tarball.sh index 4d2d352..a68d4d9 100755 --- a/make-tarball.sh +++ b/make-tarball.sh @@ -37,7 +37,7 @@ eread() { shift done } -eread PATCH_VER UCLIBC_VER PIE_VER PP_VER HTB_VER HTB_GCC_VER MAN_VER SPECS_VER +eread PATCH_VER UCLIBC_VER PIE_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} if [[ ! -d ./${gver} ]] ; then @@ -49,7 +49,7 @@ echo "Building patches for gcc version ${gver}" echo " - PATCH: ${PATCH_VER}" echo " - UCLIBC: ${UCLIBC_VER}" echo " - PIE: ${PIE_VER}" -echo " - SPECS: ${SPECS_VER}" +echo " - SPECS: ${SPECS_VER} (${SPECS_GCC_VER:-${gver}})" echo " - SSP: ${PP_VER}" echo " - BOUNDS: ${HTB_GCC_VER}-${HTB_VER}" echo " - MAN: ${MAN_VER}" @@ -64,7 +64,7 @@ mkdir -p tmp/patch/exclude tmp/uclibc tmp/piepatch tmp/specs [[ -n ${UCLIBC_VER} ]] && cp -r ${gver}/uclibc/* ../README* tmp/uclibc/ [[ -n ${PIE_VER} ]] && cp -r ${gver}/pie/* ../README* tmp/piepatch/ [[ -n ${PP_VER} ]] && cp -r ${gver}/ssp tmp/ -[[ -n ${SPECS_VER} ]] && cp -r ${gver}/specs/* ../README* tmp/specs/ +[[ -n ${SPECS_VER} ]] && cp -r ${SPECS_GCC_VER:-${gver}}/specs/* tmp/specs/ # extra cruft [[ -n ${HTB_VER} ]] && \ cp ${gver}/misc/bounds-checking-gcc*.patch \ |