More fixes to libpng build

Signed-off-by: falkTX <falktx@falktx.com>
DISTRHO · Dec 11, 2022 · a269cc5 · a269cc5
1 parent 1de7448
commit a269cc5
Showing 1 changed file with 9 additions and 4 deletions.
diff --git a/bootstrap-plugins.sh b/bootstrap-plugins.sh
@@ -38,12 +38,17 @@ source setup/versions.sh
 # ---------------------------------------------------------------------------------------------------------------------
 # libpng
 
+LIBPNG_EXTRAFLAGS=""
+
+# bypass broken zlib configure tests
 if [ "${MACOS}" -eq 0 ]; then
-    # fix build
+    LIBPNG_EXTRAFLAGS+=" ac_cv_lib_z_zlibVersion=yes"
     export EXTRA_CPPFLAGS="-I${PAWPAW_PREFIX}/include"
-    if [ -z "${PAWPAW_SKIP_LTO}" ] || [ "${PAWPAW_SKIP_LTO}" -eq 0 ]; then
-        export EXTRA_CPPFLAGS+=" -fno-lto"
-    fi
+fi
+
+if [ "${MACOS_UNIVERSAL}" -eq 1 ]; then
+    # FIXME
+    LIBPNG_EXTRAFLAGS+=" --disable-hardware-optimizations"
 fi
 
 download libpng "${LIBPNG_VERSION}" "${LIBPNG_URL}" "tar.xz"