Add -D_FORTIFY_SOURCE=0 for C++ if we're using it for C.
Change-Id: Ideaba2faaa7b968947f7af90b41c40a8edb4d3c2 Reviewed-on: https://code.wireshark.org/review/32160 Reviewed-by: Guy Harris <guy@alum.mit.edu>
This commit is contained in:
parent
1798a3f295
commit
372b9657a6
|
@ -1241,7 +1241,7 @@ install_libxml2() {
|
||||||
$no_build && echo "Skipping installation" && return
|
$no_build && echo "Skipping installation" && return
|
||||||
gzcat libxml2-$LIBXML2_VERSION.tar.gz | tar xf - || exit 1
|
gzcat libxml2-$LIBXML2_VERSION.tar.gz | tar xf - || exit 1
|
||||||
cd libxml2-$LIBXML2_VERSION
|
cd libxml2-$LIBXML2_VERSION
|
||||||
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 -D_FORTIFY_SOURCE=0 $VERSION_MIN_FLAGS $SDKFLAGS" LDFLAGS="$LDFLAGS $VERSION_MIN_FLAGS $SDKFLAGS" ./configure || exit 1
|
||||||
make $MAKE_BUILD_OPTS || exit 1
|
make $MAKE_BUILD_OPTS || exit 1
|
||||||
$DO_MAKE_INSTALL || exit 1
|
$DO_MAKE_INSTALL || exit 1
|
||||||
cd ..
|
cd ..
|
||||||
|
@ -1303,8 +1303,8 @@ install_lz4() {
|
||||||
$no_build && echo "Skipping installation" && return
|
$no_build && echo "Skipping installation" && return
|
||||||
gzcat lz4-$LZ4_VERSION.tar.gz | tar xf - || exit 1
|
gzcat lz4-$LZ4_VERSION.tar.gz | tar xf - || exit 1
|
||||||
cd lz4-$LZ4_VERSION
|
cd lz4-$LZ4_VERSION
|
||||||
# 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 -D_FORTIFY_SOURCE=0 $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
|
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" make $MAKE_BUILD_OPTS || exit 1
|
||||||
$DO_MAKE_INSTALL || exit 1
|
$DO_MAKE_INSTALL || exit 1
|
||||||
cd ..
|
cd ..
|
||||||
touch lz4-$LZ4_VERSION-done
|
touch lz4-$LZ4_VERSION-done
|
||||||
|
@ -1348,7 +1348,7 @@ install_sbc() {
|
||||||
$no_build && echo "Skipping installation" && return
|
$no_build && echo "Skipping installation" && return
|
||||||
gzcat sbc-$SBC_VERSION.tar.gz | tar xf - || exit 1
|
gzcat sbc-$SBC_VERSION.tar.gz | tar xf - || exit 1
|
||||||
cd sbc-$SBC_VERSION
|
cd sbc-$SBC_VERSION
|
||||||
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
|
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 --disable-tools --disable-tester --disable-shared || exit 1
|
||||||
make $MAKE_BUILD_OPTS || exit 1
|
make $MAKE_BUILD_OPTS || exit 1
|
||||||
$DO_MAKE_INSTALL || exit 1
|
$DO_MAKE_INSTALL || exit 1
|
||||||
cd ..
|
cd ..
|
||||||
|
|
Loading…
Reference in New Issue