]> git.ipfire.org Git - thirdparty/nettle.git/commitdiff
Fix gnutls ci job to not replace the system's nettle libraries.
authorNiels Möller <nisse@lysator.liu.se>
Thu, 2 Apr 2020 19:42:21 +0000 (21:42 +0200)
committerNiels Möller <nisse@lysator.liu.se>
Thu, 2 Apr 2020 19:42:21 +0000 (21:42 +0200)
.gitlab-ci.yml

index 663f98f5cb8e5133c979e3822f0fccb538b6f81f..b904e9c4d7c1c7c3ca5a1ca8a29ac33fde8a0f0e 100644 (file)
@@ -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