From 2354d9dd42d9ac047a4b01eac2fceccf65be0514 Mon Sep 17 00:00:00 2001
From: Kleis Auke Wolthuizen <github@kleisauke.nl>
Date: Fri, 5 Aug 2022 13:11:56 +0200
Subject: [PATCH] libvips: enable the SSSE3 target (#8156)

* libvips: enable the SSSE3 target

This reverts commit 91225182, which was introduced in PR #6845.

* libvips: make CMake aware of the CPPFLAGS env
---
 projects/libvips/build.sh | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/projects/libvips/build.sh b/projects/libvips/build.sh
index 9f97a9982..3fd832401 100755
--- a/projects/libvips/build.sh
+++ b/projects/libvips/build.sh
@@ -162,13 +162,11 @@ popd
 pushd $SRC/libjxl
 # Ensure libvips finds JxlEncoderInitBasicInfo
 sed -i '/^Libs.private:/ s/$/ -lc++/' lib/jxl/libjxl.pc.in
-# FIXME: Remove the `-DHWY_DISABLED_TARGETS=HWY_SSSE3` workaround, see:
-# https://github.com/libjxl/libjxl/issues/858
-extra_libjxl_flags='-DHWY_DISABLED_TARGETS=HWY_SSSE3'
+# CMake ignores the CPPFLAGS env, so prepend it to -DCMAKE_C{XX,}_FLAGS instead
 cmake \
   -DCMAKE_BUILD_TYPE=RelWithDebInfo \
-  -DCMAKE_C_FLAGS="$CPPFLAGS $CFLAGS $extra_libjxl_flags" \
-  -DCMAKE_CXX_FLAGS="$CPPFLAGS $CXXFLAGS $extra_libjxl_flags" \
+  -DCMAKE_C_FLAGS="$CPPFLAGS $CFLAGS" \
+  -DCMAKE_CXX_FLAGS="$CPPFLAGS $CXXFLAGS" \
   -DCMAKE_INSTALL_PREFIX=$WORK \
   -DZLIB_ROOT=$WORK \
   -DBUILD_SHARED_LIBS=0 \