X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=maint%2Ftravis-ci_scripts%2F10_before_install.bash;h=547fa8b0548abc7836fff26f38a9eea265a205c8;hb=9ab03b7c122ecdf0779aaaa599423a6a92a8533a;hp=157320ef413f2814758073519391b16d0e3c1a33;hpb=394f81ad61a22517728069dc5da1695eb21d56f8;p=dbsrgits%2FDBIx-Class.git

diff --git a/maint/travis-ci_scripts/10_before_install.bash b/maint/travis-ci_scripts/10_before_install.bash
index 157320e..547fa8b 100755
--- a/maint/travis-ci_scripts/10_before_install.bash
+++ b/maint/travis-ci_scripts/10_before_install.bash
@@ -124,9 +124,11 @@ if [[ "$CLEANTEST" != "true" ]]; then
     "sudo dpkg -i $( echo ${manual_debs[@]/#/$CACHE_DIR/*/*/} ) || sudo bash -c 'source maint/travis-ci_scripts/common.bash && apt_install -f'"
 
 
-  # needs to happen separately and *after* db2exc, as the former shits all over /usr/include (wtf?!)
-  # for more info look at /opt/ibm/db2/V9.7/instance/db2iutil :: create_links()
-  apt_install unixodbc-dev
+  # Needs to happen separately and *after* db2exc, as the former shits all over /usr/include (wtf?!)
+  # For more info look at /opt/ibm/db2/V9.7/instance/db2iutil :: create_links()
+  # The --reinstall is there in case it was already in place and got destroyed
+  # (this is the case on newer trusty images)
+  apt_install --reinstall unixodbc-dev
 
 
 ### config memcached
@@ -186,7 +188,6 @@ if [[ "$CLEANTEST" != "true" ]]; then
         cd "$(mktemp -d)"
         wget -qO- https://github.com/dbsrgits/Firebird-ODBC-driver/archive/2.0.2.153.tar.gz | tar -zx --strip-components 1
         cd Builds/Gcc.lin
-        perl -p -i -e "s|/usr/lib64|/usr/lib/x86_64-linux-gnu|g" ../makefile.environ
         make -f makefile.linux
         sudo make -f makefile.linux install
       '