<pre style='margin:0'>
Renee Otten (reneeotten) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/eb4ac36351d9ddaf950bf6773742d4d104cf29ac">https://github.com/macports/macports-ports/commit/eb4ac36351d9ddaf950bf6773742d4d104cf29ac</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new eb4ac36351d Gildas: update to 202502b
</span>eb4ac36351d is described below
<span style='display:block; white-space:pre;color:#808000;'>commit eb4ac36351d9ddaf950bf6773742d4d104cf29ac
</span>Author: Sebastien Bardeau <bardeau@iram.fr>
AuthorDate: Mon Feb 3 17:12:34 2025 +0100
<span style='display:block; white-space:pre;color:#404040;'> Gildas: update to 202502b
</span>---
science/gildas/Portfile | 15 +++---
.../gildas/files/patch-admin-Makefile.build.diff | 11 ----
science/gildas/files/patch-admin-Makefile.def.diff | 19 ++-----
.../gildas/files/patch-admin-Makefile.python.diff | 20 -------
.../gildas/files/patch-admin-define-system.sh.diff | 25 ++++++---
.../gildas/files/patch-admin-gildas-env.sh.diff | 63 +++-------------------
.../patch-admin-python-config-ldflags.py.diff | 11 ----
7 files changed, 35 insertions(+), 129 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/gildas/Portfile b/science/gildas/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index b6c52091e1f..2258b77a882 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/gildas/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/gildas/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,7 +5,7 @@ PortGroup compilers 1.0
</span> PortGroup active_variants 1.1
name gildas
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 202501a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 202502b
</span> set my_version [string tolower [clock format [clock scan 2000-[string range ${version} 4 5]-10] -format %b]][string range ${version} 2 3][string range ${version} 6 end]
supported_archs arm64 x86_64
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -31,17 +31,14 @@ master_sites https://www.iram.fr/~gildas/dist/ \
</span> distname ${name}-src-${my_version}
use_xz yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 0a8547885911553d5bfd371ec7c751a703d7af30 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 8fd4224351bfc424699ad943d574ad755bcc6168212d886bb32b0e7532c9e487 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 46401688
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 92994e93a681391a7bfb2eea6b40fd219eded9a9 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 64bc487d47cfc81e36b9eac763597b73fbc442d987e2a95c293c5d786b73e719 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 47160356
</span>
patch.pre_args-replace -p0 -p1
patchfiles patch-admin-Makefile.def.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-admin-Makefile.python.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-admin-Makefile.build.diff \
</span> patch-admin-gildas-env.sh.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-admin-define-system.sh.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-admin-python-config-ldflags.py.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-admin-define-system.sh.diff
</span>
depends_lib path:lib/pkgconfig/gtk+-2.0.pc:gtk2 \
port:libpng \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -85,7 +82,7 @@ configure {
</span> reinplace -W ${worksrcpath}/admin "s|@CPP@|${configure.cpp}|g" Makefile.def define-system.sh
reinplace -W ${worksrcpath}/admin "s|@CPPFLAGS@|${configure.cppflags}|g" Makefile.def
reinplace -W ${worksrcpath}/admin "s|@LDFLAGS@|${configure.ldflags}|g" Makefile.def
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace -W ${worksrcpath}/admin "s|@PYTHON@|${configure.python}|g" Makefile.build Makefile.def Makefile.python gildas-env.sh python-config-ldflags.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -W ${worksrcpath}/admin "s|@PYTHON@|${configure.python}|g" define-system.sh
</span> }
build {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/gildas/files/patch-admin-Makefile.build.diff b/science/gildas/files/patch-admin-Makefile.build.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 71fb2c90a2c..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/gildas/files/patch-admin-Makefile.build.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- gildas-src-dec24a/admin/Makefile.build.orig 2024-12-02 17:31:56
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ gildas-src-dec24a/admin/Makefile.build 2024-12-03 12:05:32
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -313,7 +313,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PYCOMPILE = \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if [ "$(PYTHON_PRESENT)" = "yes" ]; then \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- python -c "import py_compile; py_compile.compile('$@')" || exit $$?; \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ @PYTHON@ -c "import py_compile; py_compile.compile('$@')" || exit $$?; \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(bindir)/%.py: %.py | $(bindir)
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/gildas/files/patch-admin-Makefile.def.diff b/science/gildas/files/patch-admin-Makefile.def.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index d6310f74f1a..6bf32488cfb 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/gildas/files/patch-admin-Makefile.def.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/gildas/files/patch-admin-Makefile.def.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- gildas-src-dec15a/admin/Makefile.def.orig 2015-11-30 13:25:52.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ gildas-src-dec15a/admin/Makefile.def 2015-12-04 16:19:05.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -72,12 +72,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- gildas-src-feb25b/admin/Makefile.def.orig 2025-02-03 12:14:59
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ gildas-src-feb25b/admin/Makefile.def 2025-02-03 15:20:06
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -70,12 +70,12 @@
</span> # The following variables are provided to the user so that he can override
# the preprocessing, compilation and linking options defined by default
# later in this file. User can modify them here.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -19,7 +19,7 @@
</span>
# The following variables are for mandatory GLOBAL definitions.
# They should be modified only in this file.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -219,7 +219,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -232,7 +232,7 @@
</span> # Fortran preprocessing
# Preprocessor command
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27,13 +27,4 @@
</span> +CPP = @CPP@
# Preprocessor generic flags
<span style='display:block; white-space:pre;background:#ffe0e0;'>- GLOBAL_CPPFLAGS += -P -traditional -C
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -551,7 +551,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- SIC_SYS_LIBS =
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- SIC_LIB_DEPENDS += $(_GAG_LIBS) $(LEGACY_LIBS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ifeq ($(PYTHON_PRESENT),yes)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- SIC_SYS_LIBS += $(shell python $(gagadmdir)/python-config-ldflags.py)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ SIC_SYS_LIBS += $(shell @PYTHON@ $(gagadmdir)/python-config-ldflags.py)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ifeq ($(CFITSIO_PRESENT),yes)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- SIC_LIB_DEPENDS += -lcfitsio
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GLOBAL_CPPFLAGS += -P -traditional -C
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/gildas/files/patch-admin-Makefile.python.diff b/science/gildas/files/patch-admin-Makefile.python.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 29a498d49d2..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/gildas/files/patch-admin-Makefile.python.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,20 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- gildas-src-dec24a/admin/Makefile.python.orig 2024-12-02 17:31:56
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ gildas-src-dec24a/admin/Makefile.python 2024-12-03 12:01:28
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -19,7 +19,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Python 3.*: SO = .cpython-34m.so EXT_SUFFIX = .cpython-34m.so
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Python 3.11: SO = (undefined) EXT_SUFFIX = .cpython-34m.so
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # See also: https://bugs.python.org/issue16754
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--PYTHON_SO_EXT=$(shell python -c "import sysconfig; print(sysconfig.get_config_var('EXT_SUFFIX'))")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+PYTHON_SO_EXT=$(shell @PYTHON@ -c "import sysconfig; print(sysconfig.get_config_var('EXT_SUFFIX'))")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- MOD_NAME = $(pythondir)/$(MOD_IDENTITY)$(PYTHON_SO_EXT)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -50,7 +50,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ifneq ($(MOD_IDENTITY),)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(MOD_NAME): $(MOD_SOURCES) $(MOD_INCLUDES) $(MOD_EXTRAS) $(builddir)/setup.py $(SO_NAME) | $(pythondir)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- $(GAG_PYTHON_DISTFLAGS) python $(builddir)/setup.py build --build-base $(builddir) --build-lib $(builddir)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(GAG_PYTHON_DISTFLAGS) @PYTHON@ $(builddir)/setup.py build --build-base $(builddir) --build-lib $(builddir)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ifneq ($(MOD_POST_SETUP),)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(MOD_POST_SETUP)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/gildas/files/patch-admin-define-system.sh.diff b/science/gildas/files/patch-admin-define-system.sh.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 19b550b1fed..a60328e30d7 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/gildas/files/patch-admin-define-system.sh.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/gildas/files/patch-admin-define-system.sh.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,5 +1,5 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- gildas-src-feb24a/admin/define-system.sh.orig 2024-02-01 05:00:11
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ gildas-src-feb24a/admin/define-system.sh 2024-02-01 09:55:06
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- gildas-src-feb25b/admin/define-system.sh.orig 2025-02-03 12:14:59
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ gildas-src-feb25b/admin/define-system.sh 2025-02-03 15:43:56
</span> @@ -25,7 +25,7 @@
# Return 0 if first argument is "lower or equal" the second argument
# NB: the line return in echo below is more portable than echo -e "\n"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -9,7 +9,7 @@
</span> }
verlt() {
# Return 0 if first argument is "lower than" second argument
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -283,18 +283,18 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -272,18 +272,18 @@
</span> else
GAG_MACHINE=pc
fi
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -34,7 +34,7 @@
</span> fi
elif [ `uname -p` = "arm" ]; then
GAG_MACHINE=arm64
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -522,10 +522,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -524,19 +524,19 @@
</span> GAG_COMPILER_FLIBS="-lgfortran"
fi
#
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -47,8 +47,19 @@
</span> + GAG_COMPILER_CPPFLAGS="$GAG_COMPILER_CPPFLAGS -ffreestanding"
fi
#
<span style='display:block; white-space:pre;background:#ffe0e0;'>- export GAG_COMPILER_FFLAGS GAG_COMPILER_FLIBS GAG_COMPILER_CPPFLAGS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -548,7 +550,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ export GAG_COMPILER_FLIBS GAG_COMPILER_CPPFLAGS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ export GAG_COMPILER_FFLAGS GAG_COMPILER_SLDFLAGS GAG_COMPILER_FLDFLAGS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if \which python > /dev/null 2>&1; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- GAG_PYTHON_EXE=python
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- elif \which python3 > /dev/null 2>&1; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- GAG_PYTHON_EXE=python3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if \which @PYTHON@ > /dev/null 2>&1; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ GAG_PYTHON_EXE=@PYTHON@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GAG_PYTHON_EXE=
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -564,7 +564,7 @@
</span> # source admin/gildas-env.sh -c ifort (use default ifort e.g. ifort 11) and
# source admin/gildas-env.sh -c ifort14 (i.e. use namely non default ifort 14)
# does not build their binaries in the same integration branch.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -56,4 +67,4 @@
</span> + GAG_EXEC_SYSTEM=$GAG_MACHINE-$GAG_TARGET_NAME-$GAG_COMPILER_FKIND
export GAG_COMP_SYSTEM GAG_EXEC_SYSTEM
export GAG_MACHINE GAG_CONFIG
<span style='display:block; white-space:pre;background:#ffe0e0;'>- export GAG_ENV_KIND GAG_ENV_NAME GAG_ENV_VERS GAG_ENV_VERS_FULL
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ export GAG_ENV_KIND GAG_ENV_NAME GAG_ENV_VERS
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/gildas/files/patch-admin-gildas-env.sh.diff b/science/gildas/files/patch-admin-gildas-env.sh.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 46cbb3bff7d..d3d8d842fcc 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/gildas/files/patch-admin-gildas-env.sh.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/gildas/files/patch-admin-gildas-env.sh.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- gildas-src-dec22a/admin/gildas-env.sh.orig 2022-12-01 05:00:13
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ gildas-src-dec22a/admin/gildas-env.sh 2022-12-02 09:35:21
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -238,19 +238,19 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- gildas-src-feb25b/admin/gildas-env.sh.orig 2025-02-03 12:14:59
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ gildas-src-feb25b/admin/gildas-env.sh 2025-02-03 15:34:33
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -250,19 +250,19 @@
</span> FFTW3_PRESENT=no
FFTW3F_PRESENT=no
#
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -31,65 +31,14 @@
</span> +# done
+# IFS=$OLDIFS
#
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if [ "$GAG_CONFIG" = -openmp ]; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if [ "$GAG_CONFIG" != -no_openmp ]; then
</span> gagenv_message "FFTW v3 are not supported in OpenMP mode. Default to GILDAS FFT."
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -397,24 +397,24 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- SQLITE3_PRESENT=no
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- SETUPTOOLS_PRESENT=no
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PYTHONCONFIG_PRESENT=no
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if \which python > /dev/null 2>&1; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if \which @PYTHON@ > /dev/null 2>&1; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Check the version of python the user is currently using
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if python -V 2>&1 > /dev/null 2>&1; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- PYTHON_VERS_FULL=`python -V 2>&1 | cut -d' ' -f2`
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if @PYTHON@ -V 2>&1 > /dev/null 2>&1; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ PYTHON_VERS_FULL=`@PYTHON@ -V 2>&1 | cut -d' ' -f2`
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PYTHON_VERS=`echo $PYTHON_VERS_FULL | \sed "s%\([0-9]\.[0-9][0-9]*\).*%\1%"`
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Search for Python header and library. kernel/python/binding/setup.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # does exactly the same, so this should be consistent
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- PYTHON_INC_DIR=`python -c "import sysconfig; print(sysconfig.get_config_var('INCLUDEPY'))"`
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ PYTHON_INC_DIR=`@PYTHON@ -c "import sysconfig; print(sysconfig.get_config_var('INCLUDEPY'))"`
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if [ -e "$PYTHON_INC_DIR/Python.h" ]; then PYTHON_INC=yes; else PYTHON_INC=no; fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- PYTHON_LIB_DIR=`python -c "import sysconfig; print(sysconfig.get_config_var('LIBDIR'))"`
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ PYTHON_LIB_DIR=`@PYTHON@ -c "import sysconfig; print(sysconfig.get_config_var('LIBDIR'))"`
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PYTHON_LIB=yes # libpython name on the various supported systems is just
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # unpredictible. Can not check in advance if the linker will
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # find it or not. See also our script python-config-ldflags.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Now search for Numpy
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if python -c "import numpy" > /dev/null 2>&1; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if @PYTHON@ -c "import numpy" > /dev/null 2>&1; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- NUMPY_PRESENT=yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- NUMPY_INC_DIR=`python -c "import numpy; print(numpy.__path__[0] + '/core/include')"`
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ NUMPY_INC_DIR=`@PYTHON@ -c "import numpy; print(numpy.__path__[0] + '/core/include')"`
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if [ -e "$NUMPY_INC_DIR/numpy/arrayobject.h" ]; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- NUMPY_INC_PRESENT=yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -422,15 +422,15 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Search for sqlite3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if python -c "import sqlite3" > /dev/null 2>&1; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if @PYTHON@ -c "import sqlite3" > /dev/null 2>&1; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- SQLITE3_PRESENT=yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Search for setuptools
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if python -c "import setuptools" > /dev/null 2>&1; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if @PYTHON@ -c "import setuptools" > /dev/null 2>&1; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- SETUPTOOLS_PRESENT=yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Search for python-config
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if \which python-config > /dev/null 2>&1; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if \which @PYTHON@-config > /dev/null 2>&1; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PYTHONCONFIG_PRESENT=yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -740,6 +740,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -760,6 +760,8 @@
</span> # environment variables:
#
unset GAG_LIB_DEP_PATH GAG_INC_DEP_PATH # Incremented by detection functions
+ GAG_INC_DEP_PATH=@PREFIX@/include
+ GAG_LIB_DEP_PATH=@PREFIX@/lib
#
<span style='display:block; white-space:pre;background:#ffe0e0;'>- gagenv_detect_atm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gagenv_detect_openmp
</span> gagenv_message ""
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/gildas/files/patch-admin-python-config-ldflags.py.diff b/science/gildas/files/patch-admin-python-config-ldflags.py.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 8a8eb2e3495..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/gildas/files/patch-admin-python-config-ldflags.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- gildas-src-jan25a/admin/python-config-ldflags.py.orig 2025-01-01 05:00:11
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ gildas-src-jan25a/admin/python-config-ldflags.py 2025-01-06 12:07:50
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -12,7 +12,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # unpredictible under the variety of machines and configurations we
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # support
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- import subprocess
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- output = subprocess.check_output(['python-config', '--ldflags','--embed'])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ output = subprocess.check_output(['@PYTHON@-config', '--ldflags','--embed'])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- output = output.decode('utf-8')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #print(output)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span></pre><pre style='margin:0'>
</pre>