From 90c51a2d517a2c26681af0d2296676e81f487336 Mon Sep 17 00:00:00 2001
From: Jay Lee <jay0lee@gmail.com>
Date: Tue, 23 Apr 2019 20:00:39 -0400
Subject: [PATCH] dist

---
 src/travis/linux-x86_64-before-install.sh | 27 ++++++++++++++---------
 src/travis/linux-x86_64-install.sh        |  1 -
 2 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/src/travis/linux-x86_64-before-install.sh b/src/travis/linux-x86_64-before-install.sh
index 6799daeb..416f3590 100755
--- a/src/travis/linux-x86_64-before-install.sh
+++ b/src/travis/linux-x86_64-before-install.sh
@@ -1,12 +1,13 @@
-whereibelong=$(pwd)
+export whereibelong=$(pwd)
+export dist=$(lsb_release --codename --short)
+echo "We are running on Ubuntu $dist"
 echo "RUNNING: apt update..."
 sudo apt-get --yes update > /dev/null
 echo "RUNNING: apt dist-upgrade..."
 sudo apt-get --yes dist-upgrade > /dev/null
 echo "Installing build tools..."
 sudo apt-get --yes install build-essential
-echo "Installing StaticX deps..."
-sudo apt-get --yes install binutils patchelf
+
 echo "Installing deps for python3"
 sudo cp -v /etc/apt/sources.list /tmp
 chmod a+rwx /tmp/sources.list
@@ -20,14 +21,6 @@ echo "My Path is $mypath"
 cpucount=$(nproc --all)
 echo "This device has $cpucount CPUs for compiling..."
 
-# Compile patchelf (no ubuntu package till Xenial)
-PATCHELF_VER=0.10
-wget https://nixos.org/releases/patchelf/patchelf-$PATCHELF_VER/patchelf-$PATCHELF_VER.tar.bz2
-tar xf patchelf-$PATCHELF_VER.tar.bz2
-cd patchelf-$PATCHELF_VER
-./configure
-make
-sudo make install
 
 # Compile latest OpenSSL
 OPENSSL_VER=1.1.1b
@@ -64,6 +57,18 @@ pip=~/python/bin/pip3
 
 $python -V
 
+if [[ "$dist" == "precise" ]]; then
+  echo "Installing patchelf for StaticX..."
+  # Compile patchelf (no ubuntu package till Xenial)
+  PATCHELF_VER=0.10
+  wget https://nixos.org/releases/patchelf/patchelf-$PATCHELF_VER/patchelf-$PATCHELF_VER.tar.bz2
+  tar xf patchelf-$PATCHELF_VER.tar.bz2
+  cd patchelf-$PATCHELF_VER
+  ./configure
+  make
+  sudo make install
+fi
+
 cd $whereibelong
 
 echo "Upgrading pip packages..."
diff --git a/src/travis/linux-x86_64-install.sh b/src/travis/linux-x86_64-install.sh
index aca46851..32ef4bdd 100755
--- a/src/travis/linux-x86_64-install.sh
+++ b/src/travis/linux-x86_64-install.sh
@@ -12,7 +12,6 @@ echo "PyInstaller GAM  info:"
 du -h gam/gam
 time gam/gam version extended
 
-dist=$(lsb_release --codename --short)
 if [[ "$dist" == "precise" ]]; then
   GAM_LEGACY_ARCHIVE=gam-$GAMVERSION-$GAMOS-$PLATFORM-legacy.tar.xz
   $python -OO -m staticx gam/gam gam/gam-staticx