From 3c0a4a57b60e7777491ca4e76b263e034b6d96e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20M=C3=B6ller?= <nisse@lysator.liu.se>
Date: Thu, 2 Apr 2020 21:42:21 +0200
Subject: [PATCH] Fix gnutls ci job to not replace the system's nettle
libraries.
---
.gitlab-ci.yml | 7 ++++---
1 file 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
--
GitLab