From: Niels Möller <nisse@lysator.liu.se>
Date: Sat, 30 Sep 2023 18:09:38 +0000 (+0200)
Subject: Add more cross builds using new template and image.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2372247afa22efe324f836f8a44c93690d444c09;p=thirdparty%2Fnettle.git

Add more cross builds using new template and image.
---

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0c135af9..d9e2a6fd 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -163,8 +163,7 @@ Debian.cross.x86:
   - linux
   except:
   - tags
-Debian.cross.arm-linux-gnueabihf:
-  <<: *Debian_cross_template
+
 Debian.cross.aarch64-linux-gnu:
   <<: *Debian_cross_template
 Debian.cross.powerpc64-linux-gnu:
@@ -221,7 +220,7 @@ remote/s390x:
   # Disable C++, to not depend on cross g++.
   - export CXX=/bin/false
   - ./.bootstrap
-  - ./configure --disable-static --disable-documentation $EXTRA_CONFIGURE_FLAGS --build=$build --host=$host
+  - ./configure --disable-documentation --build=$build --host=$host
   - make -j$(nproc)
   - NETTLE_TEST_SEED=0 make -j$(nproc) check
   - NETTLE_TEST_SEED=0 make -j$(nproc) check-fat
@@ -233,3 +232,15 @@ remote/s390x:
 
 cross.arm-linux-gnueabihf:
   extends: .cross-build
+
+cross.aarch64-linux-gnu:
+  extends: .cross-build
+
+cross.powerpc64-linux-gnu:
+  extends: .cross-build
+
+cross.powerpc64le-linux-gnu:
+  extends: .cross-build
+
+cross.s390x-linux-gnu:
+  extends: .cross-build