diff options
| author | Vadim Yanitskiy <vyanitskiy@sysmocom.de> | 2021-04-18 21:05:52 +0200 |
|---|---|---|
| committer | Vadim Yanitskiy <vyanitskiy@sysmocom.de> | 2021-04-18 21:14:21 +0200 |
| commit | 69ce121c6cbbff78235a23de66cc3e64312f0cef (patch) | |
| tree | 2e3e9b6764180f6d46239fd64d55af4eb8de2259 | |
| parent | a663ed23b16f8569f43943aa7968d87e9a8586cd (diff) | |
contrib/jenkins.sh: fix: pass '--enable-manuals' to configure
Currently `make publish` fails on Jenkins because there is nothing
to publish. In [1] we simply forgot to pass '--enable-manuals'
if $WITH_MANUALS is set to 1, so no PDFs are built. Fix this.
Change-Id: I85dfecf2025a0466fccfe5a1e63cda788f85992e
Fixes: [1] I28353f51de798535a3bb6efdc6c2da443d96ddfb
| -rwxr-xr-x | contrib/jenkins.sh | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index ae5177f..683fb9d 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -24,6 +24,13 @@ export PKG_CONFIG_PATH="$inst/lib/pkgconfig:$PKG_CONFIG_PATH" export LD_LIBRARY_PATH="$inst/lib" osmo-build-dep.sh libosmocore "" '--disable-doxygen --enable-gnutls' +# Additional configure options and depends +CONFIG="" +if [ "$WITH_MANUALS" = "1" ]; then + osmo-build-dep.sh osmo-gsm-manuals + CONFIG="--enable-manuals" +fi + set +x echo echo @@ -35,10 +42,14 @@ set -x cd "$base" autoreconf --install --force -PCAP_LIBS="-lpcap" PCAP_CFLAGS="" ./configure --with-pcap-config=/bin/true --enable-sanitize --enable-werror +PCAP_LIBS="-lpcap" PCAP_CFLAGS="" ./configure \ + --with-pcap-config=/bin/true \ + --enable-sanitize \ + --enable-werror \ + $CONFIG $MAKE $PARALLEL_MAKE $MAKE check || cat-testlogs.sh -DISTCHECK_CONFIGURE_FLAGS="--with-pcap-config=/bin/true" \ +DISTCHECK_CONFIGURE_FLAGS="--with-pcap-config=/bin/true $CONFIG" \ PCAP_LIBS="-lpcap" PCAP_CFLAGS="" \ $MAKE distcheck || cat-testlogs.sh |