diff options
| author | Yvan Roux <yvan.roux@linaro.org> | 2016-02-25 13:12:06 +0100 |
|---|---|---|
| committer | Yvan Roux <yvan.roux@linaro.org> | 2016-02-25 13:12:06 +0100 |
| commit | d91b5e435be0049b23c5bc2f5f58f02d065ee8d9 (patch) | |
| tree | 7d6a1a331faf80e28d7dea0f645c403a57f87e5f | |
| parent | fb81d31e3cb8fba013663c42189d37e24a5146ab (diff) | |
Add dejagnu version handling on the command line.
Change-Id: I03be5ada35feceeec7318b0b73514f9738809736
| -rwxr-xr-x | abe.sh | 7 | ||||
| -rw-r--r-- | lib/checkout.sh | 7 | ||||
| -rwxr-xr-x | lib/depend.sh | 7 |
3 files changed, 17 insertions, 4 deletions
@@ -40,7 +40,7 @@ usage() [--snapshots <path>] [--tarball] [--tarbin] [--tarsrc] [--rpm] [--target {<target_triple>|''}] [--timeout <timeout_value>] [--usage] - [{binutils|gcc|gmp|mpfr|mpc|eglibc|glibc|newlib} + [{binutils|dejagnu|gcc|gmp|mpfr|mpc|eglibc|glibc|newlib} =<id|snapshot|url>]] EOF @@ -335,7 +335,7 @@ OPTIONS --usage Display synopsis information. - [{binutils|gcc|gmp|mpfr|mpc|eglibc|glibc|newlib}=<id|snapshot|url>] + [{binutils|dejagnu|gcc|gmp|mpfr|mpc|eglibc|glibc|newlib}=<id|snapshot|url>] This option specifies a particular version of a package that might differ from the default version in the @@ -1093,6 +1093,9 @@ while test $# -gt 0; do b*|binutils) binutils_version="`echo ${value}`" ;; + dejagnu) + dejagnu_version="${value}" + ;; gc*|gcc) gcc_version="${value}" ;; diff --git a/lib/checkout.sh b/lib/checkout.sh index 30c7b824..6b2da675 100644 --- a/lib/checkout.sh +++ b/lib/checkout.sh @@ -50,7 +50,12 @@ checkout_infrastructure() # We have to grep each dependency separately to preserve the order, as # some libraries depend on other libraries being bult first. Egrep # unfortunately sorts the files, which screws up the order. - local files="`grep ^latest= ${topdir}/config/dejagnu.conf | cut -d '\"' -f 2`" + local files= + if test x"${dejagnu_version}" = x; then + files="`grep ^latest= ${topdir}/config/dejagnu.conf | cut -d '\"' -f 2`" + else + files="${dejagnu_version}" + fi local version= for i in ${depends}; do diff --git a/lib/depend.sh b/lib/depend.sh index 04d0c934..00a0c929 100755 --- a/lib/depend.sh +++ b/lib/depend.sh @@ -157,7 +157,12 @@ infrastructure() # We have to grep each dependency separately to preserve the order, as # some libraries depend on other libraries being bult first. Egrep # unfortunately sorts the files, which screws up the order. - local files="`grep ^latest= ${topdir}/config/dejagnu.conf | cut -d '\"' -f 2`" + local files= + if test x"${dejagnu_version}" = x; then + files="`grep ^latest= ${topdir}/config/dejagnu.conf | cut -d '\"' -f 2`" + else + files="${dejagnu_version}" + fi local version= for i in ${depends}; do |