diff options
| author | Dean Scarff <deanscarff@google.com> | 2020-04-06 09:19:52 +0200 |
|---|---|---|
| committer | Jay Berkenbilt <jberkenbilt@users.noreply.github.com> | 2020-04-06 15:01:55 +0200 |
| commit | 98174373b92ea949e3b5ff44dff88ba4d060df2c (patch) | |
| tree | 14bac438b28a2095bf9c263f0134681cb4695ffa /azure-pipelines | |
| parent | 0f2507234fbe3bd305404b1267607b9900857523 (diff) | |
| download | qpdf-98174373b92ea949e3b5ff44dff88ba4d060df2c.tar.zst | |
Update azure-pipelines for openssl crypto provider
Explicitly enable openssl crypto provider in the linux and sanitizer
builds, and disable it in the windows build.
Diffstat (limited to 'azure-pipelines')
| -rwxr-xr-x | azure-pipelines/build-linux | 4 | ||||
| -rwxr-xr-x | azure-pipelines/build-linux32 | 2 | ||||
| -rwxr-xr-x | azure-pipelines/build-windows | 2 | ||||
| -rwxr-xr-x | azure-pipelines/test-sanitizers | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/azure-pipelines/build-linux b/azure-pipelines/build-linux index 9524b413..266b9920 100755 --- a/azure-pipelines/build-linux +++ b/azure-pipelines/build-linux @@ -3,9 +3,9 @@ set -ex sudo apt-get update sudo apt-get -y install \ autoconf build-essential zlib1g-dev libjpeg-dev libgnutls28-dev \ - docbook-xsl fop xsltproc libxml2-utils inkscape imagemagick + libssl-dev docbook-xsl fop xsltproc libxml2-utils inkscape imagemagick ./configure --enable-werror --enable-doc-maintenance \ - --enable-crypto-native --enable-crypto-gnutls \ + --enable-crypto-native --enable-crypto-openssl --enable-crypto-gnutls \ --enable-show-failed-test-output make -j$(nproc) -k for i in $(./qpdf/build/qpdf --show-crypto); do diff --git a/azure-pipelines/build-linux32 b/azure-pipelines/build-linux32 index 6a68028e..2c516278 100755 --- a/azure-pipelines/build-linux32 +++ b/azure-pipelines/build-linux32 @@ -16,7 +16,7 @@ sudo apt-get update sudo apt-get -y install \ autoconf build-essential zlib1g-dev:i386 libjpeg-dev:i386 \ - g++-multilib + libssl-dev:i386 g++-multilib ./configure --enable-werror --enable-show-failed-test-output \ CFLAGS=-m32 CXXFLAGS=-m32 LDFLAGS=-m32 diff --git a/azure-pipelines/build-windows b/azure-pipelines/build-windows index cd65ec6c..9e902e52 100755 --- a/azure-pipelines/build-windows +++ b/azure-pipelines/build-windows @@ -27,7 +27,7 @@ PATH=$cwd/libqpdf/build:$PATH installdir=install-$tool$wordsize rm -rf $installdir -./config-$tool --enable-show-failed-test-output --disable-crypto-gnutls +./config-$tool --enable-show-failed-test-output --disable-crypto-gnutls --disable-crypto-openssl make -j$(nproc) -k make -k check make install diff --git a/azure-pipelines/test-sanitizers b/azure-pipelines/test-sanitizers index f20fc4b3..465b9a94 100755 --- a/azure-pipelines/test-sanitizers +++ b/azure-pipelines/test-sanitizers @@ -7,7 +7,7 @@ sudo apt-get -y install \ CFLAGS="-fsanitize=address -fsanitize=undefined -g" \ CXXFLAGS="-fsanitize=address -fsanitize=undefined -g" \ LDFLAGS="-fsanitize=address -fsanitize=undefined" \ - --enable-crypto-native --enable-crypto-gnutls \ + --enable-crypto-native --enable-crypto-openssl --enable-crypto-gnutls \ --enable-werror --disable-shared --enable-show-failed-test-output make -j$(nproc) -k for i in $(./qpdf/build/qpdf --show-crypto); do |