From b9e125f9df6c81362e3ac9882c7ecb842f110916 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim=20R=C3=BChsen?= Date: Wed, 21 Jun 2017 00:03:06 +0200 Subject: [PATCH] [libpsl] Install libidn2 from git and statically link the fuzz target against it (#680) --- projects/libpsl/Dockerfile | 8 ++++++-- projects/libpsl/build.sh | 5 ++++- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/projects/libpsl/Dockerfile b/projects/libpsl/Dockerfile index 28cd5a8c0..2801008df 100644 --- a/projects/libpsl/Dockerfile +++ b/projects/libpsl/Dockerfile @@ -22,9 +22,13 @@ RUN apt-get update && apt-get install -y \ autoconf \ automake \ libtool \ - libidn2-0-dev \ libunistring-dev \ - gtk-doc-tools + gtk-doc-tools \ + gettext gengetopt curl gperf + +RUN git clone --depth=1 https://gitlab.com/libidn/libidn2.git +RUN cd libidn2 && git submodule update --init +RUN cd libidn2 && ./bootstrap && ./configure --enable-static --disable-doc && make && make install RUN git clone --depth=1 https://github.com/rockdaboot/libpsl.git RUN cd libpsl && git submodule update --init diff --git a/projects/libpsl/build.sh b/projects/libpsl/build.sh index 78cb24d9d..9443d009d 100755 --- a/projects/libpsl/build.sh +++ b/projects/libpsl/build.sh @@ -18,8 +18,11 @@ # avoid iconv() memleak on Ubuntu 16.04 image (breaks test suite) export ASAN_OPTIONS=detect_leaks=0 +# let 'make check' survive +export LD_LIBRARY_PATH=/usr/local/lib + ./autogen.sh -./configure --enable-static --disable-gtk-doc --enable-runtime=libidn2 --enable-builtin=libidn2 +LDFLAGS="-L/usr/local/lib" ./configure --enable-static --disable-gtk-doc --enable-runtime=libidn2 --enable-builtin=libidn2 make clean make -j$(nproc) make -j$(nproc) check