diff options
| author | Ismael Luceno | 2015-01-05 20:07:02 -0300 |
|---|---|---|
| committer | Remko van der Vossen | 2019-05-17 23:34:21 +0200 |
| commit | 1600cd684b8055a54dcb999d4f6a7ca47d339403 (patch) | |
| tree | a5fa7a503b9ecc77670ab58c2cb4fd5f3e2dd92d | |
| parent | 53d3279219d20063cf0e62c4cd9d7d5e73e944ac (diff) | |
gcc: Simplify ada binary selection
| -rwxr-xr-x | gnu/gcc/DETAILS | 18 | ||||
| -rw-r--r-- | gnu/gcc/HISTORY | 3 |
2 files changed, 8 insertions, 13 deletions
diff --git a/gnu/gcc/DETAILS b/gnu/gcc/DETAILS index 2331a8f6ff..216e5c8f25 100755 --- a/gnu/gcc/DETAILS +++ b/gnu/gcc/DETAILS @@ -45,19 +45,11 @@ if list_find "$GCC_COMPILER" "ada" ; then # step 10: restore your old gcc cache and resurrect it # -if [[ "${SMGL_COMPAT_ARCHS[1]}" == "ia32" ]] -then - VERSION13=4.7.1 - SOURCE13=ada-$VERSION13-i686-pc-linux-gnu.tar.bz2 -elif [[ "${SMGL_COMPAT_ARCHS[1]}" == "x86_64" ]] -then - VERSION13=4.9.1 - SOURCE13=ada-$VERSION13-x86_64-pc-linux-gnu.tar.bz2 -else - VERSION13=4.7.1 - SOURCE13=ada-$VERSION13-i686-pc-linux-gnu.tar.bz2 - -fi + case "${SMGL_COMPAT_ARCHS[1]}" in + x86_64) VERSION13=4.9.1 ARCH13=x86_64 ;; + *) VERSION13=4.7.1 ARCH13=i686 ;; + esac + SOURCE13=ada-$VERSION13-$ARCH13-pc-linux-gnu.tar.bz2 SOURCE13_URL[0]=http://download.sourcemage.org/distro/$SOURCE13 SOURCE13_GPG="gurus.gpg:$SOURCE13.sig:VERIFIED_UPSTREAM_KEY" SOURCE14=$SOURCE13.sig diff --git a/gnu/gcc/HISTORY b/gnu/gcc/HISTORY index 40f5d8dca7..e498008720 100644 --- a/gnu/gcc/HISTORY +++ b/gnu/gcc/HISTORY @@ -1,6 +1,9 @@ 2015-04-02 Vlad Glagolev <stealth@sourcemage.org> * DEPENDS: added missing glib2 dependency +2015-01-05 Ismael Luceno <ismael@sourcemage.org> + * DETAILS: Simplified ada binary selection + 2014-11-15 Thomas Orgis <sobukus@sourcemage.org> * PRE_BUILD: patch for freetype2 headers * classpath-ft2include.patch: added said patch |