diff options
| author | Guy Harris <guy@alum.mit.edu> | 2019-02-22 12:25:46 -0800 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2019-02-22 20:26:20 +0000 |
| commit | 1798a3f29561911b7a3587fe9ce0dcc849237847 (patch) | |
| tree | 2ccc67da244b743a2ccf90d0be850f43d637e863 /tools | |
| parent | ce2dadda9f08c3548aa8dc5684d9dbf597e0a39c (diff) | |
Set CXXFLAGS and LDFLAGS for all libraries.
If a minimum version number is specified, we need them all built with
that and with the selected SDK.
Change-Id: I84b98c67c64da12d3a3b234a41991675a71aeb82
Reviewed-on: https://code.wireshark.org/review/32156
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/macos-setup.sh | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/tools/macos-setup.sh b/tools/macos-setup.sh index 5a2f6bba39..5ea3004430 100755 --- a/tools/macos-setup.sh +++ b/tools/macos-setup.sh @@ -1205,7 +1205,7 @@ install_snappy() { $no_build && echo "Skipping installation" && return gzcat snappy-$SNAPPY_VERSION.tar.gz | tar xf - || exit 1 cd snappy-$SNAPPY_VERSION - CFLAGS="$CFLAGS -D_FORTIFY_SOURCE=0" ./configure || exit 1 + CFLAGS="$CFLAGS -D_FORTIFY_SOURCE=0 $VERSION_MIN_FLAGS $SDKFLAGS" CXXFLAGS="$CXXFLAGS -D_FORTIFY_SOURCE=0 $VERSION_MIN_FLAGS $SDKFLAGS" LDFLAGS="$LDFLAGS $VERSION_MIN_FLAGS $SDKFLAGS" ./configure || exit 1 make $MAKE_BUILD_OPTS || exit 1 $DO_MAKE_INSTALL || exit 1 cd .. @@ -1241,7 +1241,7 @@ install_libxml2() { $no_build && echo "Skipping installation" && return gzcat libxml2-$LIBXML2_VERSION.tar.gz | tar xf - || exit 1 cd libxml2-$LIBXML2_VERSION - CFLAGS="$CFLAGS -D_FORTIFY_SOURCE=0" ./configure || exit 1 + CFLAGS="$CFLAGS -D_FORTIFY_SOURCE=0 $VERSION_MIN_FLAGS $SDKFLAGS" CXXFLAGS="$CXXFLAGS $VERSION_MIN_FLAGS $SDKFLAGS" LDFLAGS="$LDFLAGS $VERSION_MIN_FLAGS $SDKFLAGS" ./configure || exit 1 make $MAKE_BUILD_OPTS || exit 1 $DO_MAKE_INSTALL || exit 1 cd .. @@ -1303,8 +1303,8 @@ install_lz4() { $no_build && echo "Skipping installation" && return gzcat lz4-$LZ4_VERSION.tar.gz | tar xf - || exit 1 cd lz4-$LZ4_VERSION - # CFLAGS="$CFLAGS -D_FORTIFY_SOURCE=0" ./configure || exit 1 - make $MAKE_BUILD_OPTS || exit 1 + # CFLAGS="$CFLAGS -D_FORTIFY_SOURCE=0 $VERSION_MIN_FLAGS $SDKFLAGS" CXXFLAGS="$CXXFLAGS $VERSION_MIN_FLAGS $SDKFLAGS" LDFLAGS="$LDFLAGS $VERSION_MIN_FLAGS $SDKFLAGS" ./configure || exit 1 + CFLAGS="$CFLAGS -D_FORTIFY_SOURCE=0 $VERSION_MIN_FLAGS $SDKFLAGS" CXXFLAGS="$CXXFLAGS $VERSION_MIN_FLAGS $SDKFLAGS" LDFLAGS="$LDFLAGS $VERSION_MIN_FLAGS $SDKFLAGS" make $MAKE_BUILD_OPTS || exit 1 $DO_MAKE_INSTALL || exit 1 cd .. touch lz4-$LZ4_VERSION-done @@ -1348,7 +1348,7 @@ install_sbc() { $no_build && echo "Skipping installation" && return gzcat sbc-$SBC_VERSION.tar.gz | tar xf - || exit 1 cd sbc-$SBC_VERSION - CFLAGS="$CFLAGS -D_FORTIFY_SOURCE=0" ./configure --disable-tools --disable-tester --disable-shared || exit 1 + CFLAGS="$CFLAGS -D_FORTIFY_SOURCE=0 $VERSION_MIN_FLAGS $SDKFLAGS" CXXFLAGS="$CXXFLAGS $VERSION_MIN_FLAGS $SDKFLAGS" LDFLAGS="$LDFLAGS $VERSION_MIN_FLAGS $SDKFLAGS" ./configure --disable-tools --disable-tester --disable-shared || exit 1 make $MAKE_BUILD_OPTS || exit 1 $DO_MAKE_INSTALL || exit 1 cd .. @@ -1507,7 +1507,7 @@ install_nghttp2() { $no_build && echo "Skipping installation" && return xzcat nghttp2-$NGHTTP2_VERSION.tar.xz | tar xf - || exit 1 cd nghttp2-$NGHTTP2_VERSION - ./configure || exit 1 + CFLAGS="$CFLAGS $VERSION_MIN_FLAGS $SDKFLAGS" CXXFLAGS="$CXXFLAGS $VERSION_MIN_FLAGS $SDKFLAGS" LDFLAGS="$LDFLAGS $VERSION_MIN_FLAGS $SDKFLAGS" ./configure || exit 1 make $MAKE_BUILD_OPTS || exit 1 $DO_MAKE_INSTALL || exit 1 cd .. @@ -1543,7 +1543,7 @@ install_libtiff() { $no_build && echo "Skipping installation" && return gzcat tiff-$LIBTIFF_VERSION.tar.gz | tar xf - || exit 1 cd tiff-$LIBTIFF_VERSION - ./configure || exit 1 + CFLAGS="$CFLAGS $VERSION_MIN_FLAGS $SDKFLAGS" CXXFLAGS="$CXXFLAGS $VERSION_MIN_FLAGS $SDKFLAGS" LDFLAGS="$LDFLAGS $VERSION_MIN_FLAGS $SDKFLAGS" ./configure || exit 1 make $MAKE_BUILD_OPTS || exit 1 $DO_MAKE_INSTALL || exit 1 cd .. @@ -1585,7 +1585,7 @@ install_spandsp() { # support. # patch -p0 <../../macosx-support-lib-patches/spandsp-configure-patch || exit 1 - ./configure || exit 1 + CFLAGS="$CFLAGS $VERSION_MIN_FLAGS $SDKFLAGS" CXXFLAGS="$CXXFLAGS $VERSION_MIN_FLAGS $SDKFLAGS" LDFLAGS="$LDFLAGS $VERSION_MIN_FLAGS $SDKFLAGS" ./configure || exit 1 make $MAKE_BUILD_OPTS || exit 1 $DO_MAKE_INSTALL || exit 1 cd .. @@ -1621,7 +1621,7 @@ install_bcg729() { $no_build && echo "Skipping installation" && return gzcat bcg729-$BCG729_VERSION.tar.gz | tar xf - || exit 1 cd bcg729-$BCG729_VERSION - ./configure || exit 1 + CFLAGS="$CFLAGS $VERSION_MIN_FLAGS $SDKFLAGS" CXXFLAGS="$CXXFLAGS $VERSION_MIN_FLAGS $SDKFLAGS" LDFLAGS="$LDFLAGS $VERSION_MIN_FLAGS $SDKFLAGS" ./configure || exit 1 make $MAKE_BUILD_OPTS || exit 1 $DO_MAKE_INSTALL || exit 1 cd .. |