X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=src-release.sh;h=7c27ecfcca3157746bbbab431d5058e94aebb111;hb=4ef0bef68cfc777e59156fce1563583c0ffb76d9;hp=40d0126a0a790c2b92d1695288d9c6afd3da0edc;hpb=ec5b9462e068fba2a571ab3f3943c48250048d3c;p=deliverable%2Fbinutils-gdb.git

diff --git a/src-release.sh b/src-release.sh
index 40d0126a0a..7c27ecfcca 100755
--- a/src-release.sh
+++ b/src-release.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-#   Copyright (C) 1990-2014 Free Software Foundation
+#   Copyright (C) 1990-2018 Free Software Foundation
 #
 # This file is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -24,6 +24,7 @@ set -e
 
 BZIPPROG=bzip2
 GZIPPROG=gzip
+LZIPPROG=lzip
 XZPROG=xz
 MD5PROG=md5sum
 MAKE=make
@@ -36,7 +37,7 @@ MAKEINFOFLAGS=--split-size=5000000
 #
 # Support for building net releases
 
-# Files in devo used in any net release.
+# Files in root used in any net release.
 DEVO_SUPPORT="README Makefile.in configure configure.ac \
 	config.guess config.sub config move-if-change \
 	COPYING COPYING.LIB install-sh config-ml.in symlink-tree \
@@ -60,7 +61,7 @@ getver()
 	bfd/configure --version | sed -n -e '1s,.* ,,p'
     elif test -f $tool/common/create-version.sh; then
 	$tool/common/create-version.sh $tool 'dummy-host' 'dummy-target' VER.tmp
-	cat VER.tmp | grep 'version\[\]' | sed 's/.*"\([^"]*\)".*/\1/' | sed 's/-cvs$//'
+	cat VER.tmp | grep 'version\[\]' | sed 's/.*"\([^"]*\)".*/\1/' | sed 's/-git$//'
         rm -f VER.tmp
     elif test -f $tool/version.in; then
 	head -1 $tool/version.in
@@ -76,14 +77,28 @@ do_proto_toplev()
     ver=$2
     tool=$3
     support_files=$4
+
+    echo "==> Cleaning sources."
+    find \( -name "*.orig" -o  -name "*.rej" -o -name "*~" -o -name ".#*" -o -name "*~$bkpat" \) -exec rm {} \;
+    
     echo "==> Making $package-$ver/"
     # Take out texinfo from a few places.
     sed -e '/^all\.normal: /s/\all-texinfo //' \
 	-e '/^	install-texinfo /d' \
 	<Makefile.in >tmp
     mv -f tmp Makefile.in
-    #
-    ./configure --target=i386-pc-linux-gnu
+    # configure.  --enable-gold is needed to ensure .c/.h from .y are
+    # built in the gold dir.  The disables speed the build a little.
+    enables=
+    disables=
+    for dir in binutils gas gdb gold gprof ld libdecnumber readline sim; do
+	case " $tool $support_files " in
+	    *" $dir "*) enables="$enables --enable-$dir" ;;
+	    *) disables="$disables --disable-$dir" ;;
+	esac
+    done
+    echo "==> configure --target=i386-pc-linux-gnu $disables $enables"
+    ./configure --target=i386-pc-linux-gnu $disables $enables
     $MAKE configure-host configure-target \
 	ALL_GCC="" ALL_GCC_C="" ALL_GCC_CXX="" \
 	CC_FOR_TARGET="$CC" CXX_FOR_TARGET="$CXX"
@@ -194,6 +209,16 @@ do_gz()
     $GZIPPROG -k -v -9 $package-$ver.tar
 }
 
+# Compress the output with lzip
+do_lz()
+{
+    package=$1
+    ver=$2
+    echo "==> Lzipping $package-$ver.tar.lz"
+    rm -f $package-$ver.tar.lz
+    $LZIPPROG -k -v -9 $package-$ver.tar
+}
+
 # Compress the output with xz
 do_xz()
 {
@@ -216,6 +241,8 @@ do_compress()
 		do_bz2 $package $ver;;
 	    gz)
 		do_gz $package $ver;;
+	    lz)
+		do_lz $package $ver;;
 	    xz)
 		do_xz $package $ver;;
 	    *)
@@ -311,6 +338,7 @@ usage()
     echo "options:"
     echo "  -b: Compress with bzip2"
     echo "  -g: Compress with gzip"
+    echo "  -l: Compress with lzip"
     echo "  -x: Compress with xz"
     exit 1
 }
@@ -335,12 +363,14 @@ build_release()
 
 compressors=""
 
-while getopts ":gbx" opt; do
+while getopts ":bglx" opt; do
     case $opt in
 	b)
 	    compressors="$compressors bz2";;
 	g)
 	    compressors="$compressors gz";;
+	l)
+	    compressors="$compressors lz";;
 	x)
 	    compressors="$compressors xz";;
 	\?)