From: Dirk Lemstra Date: Tue, 26 Jun 2018 20:50:24 +0000 (+0200) Subject: Use CXXFLAGS instead of CFLAGS X-Git-Tag: 7.0.8-4~15 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=306762972e7c7dd2158bf00d39ed2ebd87c49e65;p=imagemagick Use CXXFLAGS instead of CFLAGS --- diff --git a/Magick++/fuzz/build.sh b/Magick++/fuzz/build.sh index 16acd2a1a..c7967a545 100644 --- a/Magick++/fuzz/build.sh +++ b/Magick++/fuzz/build.sh @@ -7,7 +7,7 @@ make -j$(nproc) CFLAGS="$CFLAGS -fPIC" make install popd -# build xz +# Build xz pushd "$SRC/xz" ./autogen.sh ./configure --disable-xz --disable-xzdec --disable-lzmadec --disable-lzmainfo --disable-lzma-links --disable-scripts --disable-doc --disable-shared --with-pic=yes --prefix="$WORK" @@ -15,6 +15,7 @@ make -j$(nproc) make install popd +# Build png pushd "$SRC/libpng" cmake . -DCMAKE_INSTALL_PREFIX=$WORK -DPNG_SHARED=off make -j$(nproc) @@ -47,7 +48,7 @@ popd # build libraw pushd "$SRC/libraw" autoreconf -fiv -./configure --prefix="$WORK" --disable-shared --with-pic=yes --disable-examples PKG_CONFIG_PATH="$WORK/lib/pkgconfig" CFLAGS="$CFLAGS -DLIBRAW_USE_CALLOC_INSTEAD_OF_MALLOC=on" +./configure --prefix="$WORK" --disable-shared --with-pic=yes --disable-examples PKG_CONFIG_PATH="$WORK/lib/pkgconfig" CXXFLAGS="$CXXFLAGS -DLIBRAW_USE_CALLOC_INSTEAD_OF_MALLOC=on" make -j$(nproc) make install popd