diff options
| author | Niels Möller <nisse@lysator.liu.se> | 2020-04-02 21:42:21 +0200 |
|---|---|---|
| committer | Niels Möller <nisse@lysator.liu.se> | 2020-04-02 21:42:21 +0200 |
| commit | 3c0a4a57b60e7777491ca4e76b263e034b6d96e2 (patch) | |
| tree | bdb4ed2cda920a537603b2245a9aa60161bdd82f | |
| parent | 6f0144f5de1ebb6df4837e50a4f87a4533f9913b (diff) | |
| download | nettle-3c0a4a57b60e7777491ca4e76b263e034b6d96e2.tar.gz | |
Fix gnutls ci job to not replace the system's nettle libraries.
| -rw-r--r-- | .gitlab-ci.yml | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 663f98f5..b904e9c4 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -96,12 +96,13 @@ build/gnutls: image: $CI_REGISTRY/$BUILD_IMAGES_PROJECT:$FEDORA_BUILD script: - ./.bootstrap && - - ./configure --disable-documentation --prefix=/usr --libdir=/usr/lib64 && + ./configure --disable-documentation --prefix="$(pwd)/local" --libdir="$(pwd)/local/lib" && make -j4 && make install - git clone --depth 1 --branch master https://gitlab.com/gnutls/gnutls.git gnutls-git - cd gnutls-git && git submodule update --init && ./bootstrap && - ./configure --disable-gost --disable-cxx --disable-guile --disable-doc && make -j$(nproc) && - make -j $(nproc) check + ./configure PKG_CONFIG_PATH="$(pwd)/../local/lib/pkgconfig" CPPFLAGS="-I$(pwd)/../local/include" + LDFLAGS="-L$(pwd)/../local/lib -Wl,-rpath,$(pwd)/../local/lib" --disable-gost --disable-cxx --disable-guile --disable-doc && + make -j$(nproc) && make -j $(nproc) check tags: - shared - linux |