diff options
Diffstat (limited to 'projects/wget2/build.sh')
| -rwxr-xr-x | projects/wget2/build.sh | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/projects/wget2/build.sh b/projects/wget2/build.sh index 3ad4e04bd..866a4259f 100755 --- a/projects/wget2/build.sh +++ b/projects/wget2/build.sh @@ -16,7 +16,7 @@ ################################################################################ export WGET2_DEPS_PATH=$SRC/wget2_deps -export PKG_CONFIG_PATH=$WGET2_DEPS_PATH/lib/pkgconfig +export PKG_CONFIG_PATH=$WGET2_DEPS_PATH/lib64/pkgconfig:$WGET2_DEPS_PATH/lib/pkgconfig export CPPFLAGS="-I$WGET2_DEPS_PATH/include" export LDFLAGS="-L$WGET2_DEPS_PATH/lib" export GNULIB_SRCDIR=$SRC/gnulib @@ -72,29 +72,20 @@ CFLAGS="$GNUTLS_CFLAGS" \ make -j$(nproc) make install -cd $SRC/libmicrohttpd-* -LIBS="-lgnutls -lhogweed -lnettle -lidn2 -lunistring" \ -./configure --prefix=$WGET2_DEPS_PATH --disable-doc --disable-examples --disable-shared --enable-static -make -j$(nproc) -make install - - # avoid iconv() memleak on Ubuntu 16.04 image (breaks test suite) export ASAN_OPTIONS=detect_leaks=0 cd $SRC/wget2 ./bootstrap -# build and run non-networking tests -LIBS="-lgnutls -lhogweed -lnettle -lidn2 -lunistring" \ +LIBS="-lgnutls -lhogweed -lnettle -lidn2 -lunistring -lpsl" \ ./configure -C --enable-static --disable-shared --disable-doc --without-plugin-support make clean make -j$(nproc) make -j$(nproc) -C unit-tests check make -j$(nproc) -C fuzz check -# build for fuzzing -LIBS="-lgnutls -lhogweed -lnettle -lidn2 -lunistring" \ +LIBS="-lgnutls -lhogweed -lnettle -lidn2 -lunistring -lpsl" \ ./configure -C --enable-fuzzing --enable-static --disable-shared --disable-doc --without-plugin-support make clean make -j$(nproc) -C lib @@ -102,8 +93,13 @@ make -j$(nproc) -C include make -j$(nproc) -C libwget make -j$(nproc) -C src +# Ensure our libraries can be found +ln -s $WGET2_DEPS_PATH/lib64/libhogweed.a $WGET2_DEPS_PATH/lib/libhogweed.a +ln -s $WGET2_DEPS_PATH/lib64/libnettle.a $WGET2_DEPS_PATH/lib/libnettle.a + # build fuzzers cd fuzz + CXXFLAGS="$CXXFLAGS -L$WGET2_DEPS_PATH/lib/" make oss-fuzz find . -name '*_fuzzer' -exec cp -v '{}' $OUT ';' |