]> git.ipfire.org Git - thirdparty/gnutls.git/commitdiff
.gitlab-ci.yml: fix nettle installation path
authorDaiki Ueno <ueno@gnu.org>
Fri, 26 Nov 2021 08:37:58 +0000 (09:37 +0100)
committerDaiki Ueno <ueno@gnu.org>
Wed, 9 Feb 2022 17:33:36 +0000 (18:33 +0100)
.fedora-nettle/build clones the nettle into "nettle-git" and
temporarily change the working directory while buidling it.  After
moving back to the original working directory, the installation path
should be prefixed with "${PWD}/nettle-git/".

Signed-off-by: Daiki Ueno <ueno@gnu.org>
.gitlab-ci.yml

index adbbab1df41454866563c18d26d5509759478304..f35de8ad1e5736677b968f758f81e777912c3c1f 100644 (file)
@@ -389,7 +389,7 @@ fedora-FIPS140-2/test:
     - make -j$BUILDJOBS
     - make -j$BUILDJOBS install
     - popd
-    - PKG_CONFIG_PATH=${PWD}/$NETTLE_DIR/lib64/pkgconfig dash ./configure --disable-gcc-warnings --disable-doc --disable-guile --with-pkcs12-iter-count=10000
+    - PKG_CONFIG_PATH=${PWD}/nettle-git/$NETTLE_DIR/lib64/pkgconfig dash ./configure --disable-gcc-warnings --disable-doc --disable-guile --with-pkcs12-iter-count=10000
     - make -j$BUILDJOBS
     - make -j$BUILDJOBS check TESTS=""
 
@@ -398,7 +398,7 @@ fedora-FIPS140-2/test:
     - .test
     - .fedora-nettle
   script:
-    - PKG_CONFIG_PATH=${PWD}/$NETTLE_DIR/lib64/pkgconfig LD_LIBRARY_PATH=${PWD}/$NETTLE_DIR/lib64 make -j$CHECKJOBS check
+    - PKG_CONFIG_PATH=${PWD}/nettle-git/$NETTLE_DIR/lib64/pkgconfig LD_LIBRARY_PATH=${PWD}/nettle-git/$NETTLE_DIR/lib64 make -j$CHECKJOBS check
 
 fedora-nettle/build:
   extends: