Ship 32-bit strip binary, mk. 2

TheAssassin · TheAssassin · commit b38612d07edd · 2018-11-23T17:17:38.000+01:00
diff --git a/.travis.yml b/.travis.yml
@@ -26,7 +26,7 @@ matrix:
             - automake  # required for patchelf
             - libfuse2:i386
             - libcairo2:i386
-            - strip:i386  # will be bundled, needs to be 32-bit binary
+            - binutils-i686-gnu  # to be able to bundle 32-bit strip binary
     - env: ARCH=x86_64 BUILD_TYPE=coverage
       addons:
         apt:
diff --git a/travis/build.sh b/travis/build.sh
@@ -42,8 +42,25 @@ make -j$(nproc)
 ## Run Unit Tests
 ctest -V
 
+# look for suitable strip binary to bundle
+# https://github.com/linuxdeploy/linuxdeploy/issues/59
+# first, try to find architecture aware
+strip_path=/usr/"$ARCH"*/bin/strip
+
+# another possible path
+if [[ ! -f "$strip_path" ]]; then
+    strip_path=/usr/bin/"$ARCH"*-strip
+fi
+
+# fall back to using "default" distro strip
+if [[ ! -f "$strip_path" ]]; then
+    strip_path=/usr/bin/strip
+fi
+
+# TODO: make sure strip binary's architecture matches the one we want, e.g., using file, readelf...
+
 # args are used more than once
-LINUXDEPLOY_ARGS=("--appdir" "AppDir" "-e" "bin/linuxdeploy" "-i" "$REPO_ROOT/resources/linuxdeploy.png" "--create-desktop-file" "-e" "/usr/bin/patchelf" "-e" "/usr/bin/strip")
+LINUXDEPLOY_ARGS=("--appdir" "AppDir" "-e" "bin/linuxdeploy" "-i" "$REPO_ROOT/resources/linuxdeploy.png" "--create-desktop-file" "-e" "/usr/bin/patchelf" "-e" "$strip_path")
 
 # deploy patchelf which is a dependency of linuxdeploy
 bin/linuxdeploy "${LINUXDEPLOY_ARGS[@]}"
