From b7e7903a3d517241e8ce49febddf28e5fa2fa7b9 Mon Sep 17 00:00:00 2001
From: Sergey Kosukhin <sergey.kosukhin@mpimet.mpg.de>
Date: Wed, 22 Nov 2023 13:30:31 +0100
Subject: [PATCH] ci: do not enforce Debian Autotools on Breeze
---
.ci/bb/breeze-mpim/init.sh | 12 ------------
.ci/bb/breeze-mpim/test.all.nv | 5 +----
2 files changed, 1 insertion(+), 16 deletions(-)
diff --git a/.ci/bb/breeze-mpim/init.sh b/.ci/bb/breeze-mpim/init.sh
index beb5dfdd6..599395b35 100644
--- a/.ci/bb/breeze-mpim/init.sh
+++ b/.ci/bb/breeze-mpim/init.sh
@@ -9,18 +9,6 @@ init_env ()
switch_for_module automake autoconf libtool swig ruby python
}
-#
-# Initializes the Debian libtool
-init_debian_libtool ()
-{
- export PATH="/usr/bin:${PATH-}"
- export ACLOCAL_PATH="/usr/share/aclocal:${ACLOCAL_PATH-}"
-
- # Prepend ACLOCAL_PATH with the path to Automake:
- module unload automake
- switch_for_module automake
-}
-
#
# Sets variables for tests with GCC.
#
diff --git a/.ci/bb/breeze-mpim/test.all.nv b/.ci/bb/breeze-mpim/test.all.nv
index 4025ba7b5..51ed408bc 100755
--- a/.ci/bb/breeze-mpim/test.all.nv
+++ b/.ci/bb/breeze-mpim/test.all.nv
@@ -11,15 +11,12 @@ init_nvhpc
enable_maintainer_mode='no'
if test ! -f "${top_srcdir}/configure"; then
+ "${top_srcdir}/autogen.sh"
# If there is no configure script, there are, most probably, no Fortran
# interface files, which are generated in the maintainer mode only:
enable_maintainer_mode='yes'
fi
-# We want to check with the Debian version of Libtool, which is patched to avoid
-# overlinking:
-( init_debian_libtool; "${top_srcdir}/autogen.sh" )
-
"${top_srcdir}/configure" \
--enable-cf-interface \
--enable-iso-c-interface \
--
GitLab