diff options
| author | jan Iversen <jani@libreoffice.org> | 2017-06-09 12:59:19 +0200 |
|---|---|---|
| committer | jan iversen <jani@libreoffice.org> | 2017-06-11 11:23:28 +0200 |
| commit | 2a48fd3fbb649218f66a58e70ad904411883c63d (patch) | |
| tree | 7deab6d8cc914445e8848a6ecd23bf43af380ddd /bin | |
| parent | 2a6894e05cb8b35376c47ad6301f4dc8deb56fc0 (diff) | |
allow build without tls and ssl
support for using
--disable-openssl AND --without-tls
(needed if you want to avoid including crypto code).
Change-Id: I77650e9db679ddf1690560eda069d8645acacfc4
Reviewed-on: https://gerrit.libreoffice.org/38604
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: jan iversen <jani@libreoffice.org>
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/lo-all-static-libs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/bin/lo-all-static-libs b/bin/lo-all-static-libs index 47640feaa392..c45723f938cd 100755 --- a/bin/lo-all-static-libs +++ b/bin/lo-all-static-libs @@ -43,9 +43,11 @@ ANDROID) oslibs="$oslibs $WORKDIR/UnpackedTarball/cairo/src/.libs/libcairo.a" # Only liblo-bootstrap.a ends up here: oslibs="$oslibs $WORKDIR/LinkTarget/Library/lib*.a" + osssl="$WORKDIR/UnpackedTarball/HEJ($TLS)(${DISABLE-OPENSSL})openssl/*.a" ;; IOS) oslibs="$WORKDIR/UnpackedTarball/icu/source/stubdata/*.a" + osssl="" ;; *) oslibs= @@ -75,7 +77,7 @@ echo $INSTDIR/$LIBO_LIB_FOLDER/lib*.a \ $WORKDIR/UnpackedTarball/liborcus/src/*/.libs/*.a \ $WORKDIR/UnpackedTarball/libvisio/src/lib/.libs/*.a \ $WORKDIR/UnpackedTarball/libwp?/src/lib/.libs/*.a \ - $WORKDIR/UnpackedTarball/openssl/*.a \ + $osssl \ $WORKDIR/UnpackedTarball/raptor/src/.libs/*.a \ $WORKDIR/UnpackedTarball/rasqal/src/.libs/*.a \ $WORKDIR/UnpackedTarball/redland/src/.libs/*.a \ |