diff options
| author |  Tim Rühsen <tim.ruehsen@gmx.de> | 2017-08-22 22:35:00 +0200 |
|---|---|---|
| committer |  Oliver Chang <oliverchang@users.noreply.github.com> | 2017-08-22 13:35:00 -0700 |
| commit | 0687321411d4992e558969163d87383424e34e72 (patch) | |
| tree | 779794f3155e59ccef44058df5d50bfd8e6e420e | |
| parent | e1e4c337e4070e3bbf3b7796775289a7bbf86cb0 (diff) | |
[wget2] Fixes and enhancements (#787)
| -rw-r--r-- | projects/wget2/Dockerfile | 2 | ||||
| -rwxr-xr-x | projects/wget2/build.sh | 4 |
2 files changed, 6 insertions, 0 deletions
diff --git a/projects/wget2/Dockerfile b/projects/wget2/Dockerfile index b81fde62..85b8c18d 100644 --- a/projects/wget2/Dockerfile +++ b/projects/wget2/Dockerfile @@ -35,6 +35,8 @@ RUN apt-get update && apt-get install -y \ wget \ python +ENV GNULIB_TOOL $SRC/gnulib/gnulib-tool +RUN git clone git://git.savannah.gnu.org/gnulib.git RUN git clone --depth=1 --recursive https://git.savannah.gnu.org/git/libunistring.git RUN git clone --depth=1 --recursive https://gitlab.com/libidn/libidn2.git RUN git clone --depth=1 --recursive https://github.com/rockdaboot/libpsl.git diff --git a/projects/wget2/build.sh b/projects/wget2/build.sh index a5246c0f..214244b0 100755 --- a/projects/wget2/build.sh +++ b/projects/wget2/build.sh @@ -19,6 +19,7 @@ export WGET2_DEPS_PATH=$SRC/wget2_deps export PKG_CONFIG_PATH=$WGET2_DEPS_PATH/lib/pkgconfig export CPPFLAGS="-I$WGET2_DEPS_PATH/include" export LDFLAGS="-L$WGET2_DEPS_PATH/lib" +export GNULIB_SRCDIR=$SRC/gnulib cd $SRC/libunistring ./autogen.sh @@ -58,8 +59,11 @@ if test $? != 0;then fi cd $SRC/gnutls +touch .submodule.stamp make bootstrap +GNUTLS_CFLAGS=`echo $CFLAGS|sed s/-DFUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION//` LIBS="-lunistring" \ +CFLAGS="$GNUTLS_CFLAGS" \ ./configure --with-nettle-mini --enable-gcc-warnings --enable-static --disable-shared --with-included-libtasn1 \ --with-included-unistring --without-p11-kit --disable-doc --disable-tests --disable-tools --disable-cxx \ --disable-maintainer-mode --disable-libdane --disable-gcc-warnings --prefix=$WGET2_DEPS_PATH $GNUTLS_CONFIGURE_FLAGS |