From 1c9ab1f29c4bd9625ef03b6550ced531c5055b45 Mon Sep 17 00:00:00 2001
From: Kenneth Hoste <kenneth.hoste@ugent.be>
Date: Sat, 18 Nov 2023 12:15:55 +0100
Subject: [PATCH] enhance easyconfigs for gnuplot 5.4.x to make sure that Lua
 dependency is always used

---
 .../easyconfigs/g/gnuplot/gnuplot-5.4.1-GCCcore-10.2.0.eb      | 3 +++
 .../easyconfigs/g/gnuplot/gnuplot-5.4.2-GCCcore-10.3.0.eb      | 3 +++
 .../easyconfigs/g/gnuplot/gnuplot-5.4.2-GCCcore-11.2.0.eb      | 3 +++
 .../easyconfigs/g/gnuplot/gnuplot-5.4.4-GCCcore-11.3.0.eb      | 3 +++
 .../easyconfigs/g/gnuplot/gnuplot-5.4.6-GCCcore-12.2.0.eb      | 3 +++
 .../easyconfigs/g/gnuplot/gnuplot-5.4.8-GCCcore-12.3.0.eb      | 3 +++
 6 files changed, 18 insertions(+)

diff --git a/easybuild/easyconfigs/g/gnuplot/gnuplot-5.4.1-GCCcore-10.2.0.eb b/easybuild/easyconfigs/g/gnuplot/gnuplot-5.4.1-GCCcore-10.2.0.eb
index cd32053b881..afa4c64d21f 100644
--- a/easybuild/easyconfigs/g/gnuplot/gnuplot-5.4.1-GCCcore-10.2.0.eb
+++ b/easybuild/easyconfigs/g/gnuplot/gnuplot-5.4.1-GCCcore-10.2.0.eb
@@ -44,6 +44,9 @@ dependencies = [
 
 preconfigopts = 'autoreconf && '
 
+# make sure that right Lua library is used (bypassing pkg-config)
+preconfigopts += 'export LUA_CFLAGS="-I$EBROOTLUA/include" && export LUA_LIBS="$EBROOTLUA/lib/liblua.a" && '
+
 configopts = '--with-qt=qt5 --without-latex '
 
 sanity_check_paths = {
diff --git a/easybuild/easyconfigs/g/gnuplot/gnuplot-5.4.2-GCCcore-10.3.0.eb b/easybuild/easyconfigs/g/gnuplot/gnuplot-5.4.2-GCCcore-10.3.0.eb
index f4127746086..1022e3122d1 100644
--- a/easybuild/easyconfigs/g/gnuplot/gnuplot-5.4.2-GCCcore-10.3.0.eb
+++ b/easybuild/easyconfigs/g/gnuplot/gnuplot-5.4.2-GCCcore-10.3.0.eb
@@ -33,6 +33,9 @@ dependencies = [
 
 preconfigopts = 'autoreconf && '
 
+# make sure that right Lua library is used (bypassing pkg-config)
+preconfigopts += 'export LUA_CFLAGS="-I$EBROOTLUA/include" && export LUA_LIBS="$EBROOTLUA/lib/liblua.a" && '
+
 configopts = '--with-qt=qt5 --without-latex '
 
 sanity_check_paths = {
diff --git a/easybuild/easyconfigs/g/gnuplot/gnuplot-5.4.2-GCCcore-11.2.0.eb b/easybuild/easyconfigs/g/gnuplot/gnuplot-5.4.2-GCCcore-11.2.0.eb
index c2af06feb4c..b932c85048e 100644
--- a/easybuild/easyconfigs/g/gnuplot/gnuplot-5.4.2-GCCcore-11.2.0.eb
+++ b/easybuild/easyconfigs/g/gnuplot/gnuplot-5.4.2-GCCcore-11.2.0.eb
@@ -33,6 +33,9 @@ dependencies = [
 
 preconfigopts = 'autoreconf && '
 
+# make sure that right Lua library is used (bypassing pkg-config)
+preconfigopts += 'export LUA_CFLAGS="-I$EBROOTLUA/include" && export LUA_LIBS="$EBROOTLUA/lib/liblua.a" && '
+
 configopts = '--with-qt=qt5 --without-latex '
 
 sanity_check_paths = {
diff --git a/easybuild/easyconfigs/g/gnuplot/gnuplot-5.4.4-GCCcore-11.3.0.eb b/easybuild/easyconfigs/g/gnuplot/gnuplot-5.4.4-GCCcore-11.3.0.eb
index ca1bcabdf53..899f0ad50be 100644
--- a/easybuild/easyconfigs/g/gnuplot/gnuplot-5.4.4-GCCcore-11.3.0.eb
+++ b/easybuild/easyconfigs/g/gnuplot/gnuplot-5.4.4-GCCcore-11.3.0.eb
@@ -33,6 +33,9 @@ dependencies = [
 
 preconfigopts = 'autoreconf && '
 
+# make sure that right Lua library is used (bypassing pkg-config)
+preconfigopts += 'export LUA_CFLAGS="-I$EBROOTLUA/include" && export LUA_LIBS="$EBROOTLUA/lib/liblua.a" && '
+
 configopts = '--with-qt=qt5 --without-latex '
 
 sanity_check_paths = {
diff --git a/easybuild/easyconfigs/g/gnuplot/gnuplot-5.4.6-GCCcore-12.2.0.eb b/easybuild/easyconfigs/g/gnuplot/gnuplot-5.4.6-GCCcore-12.2.0.eb
index 2dcbf8e9d5a..ee98f8ad3ad 100644
--- a/easybuild/easyconfigs/g/gnuplot/gnuplot-5.4.6-GCCcore-12.2.0.eb
+++ b/easybuild/easyconfigs/g/gnuplot/gnuplot-5.4.6-GCCcore-12.2.0.eb
@@ -33,6 +33,9 @@ dependencies = [
 
 preconfigopts = 'autoreconf && '
 
+# make sure that right Lua library is used (bypassing pkg-config)
+preconfigopts += 'export LUA_CFLAGS="-I$EBROOTLUA/include" && export LUA_LIBS="$EBROOTLUA/lib/liblua.a" && '
+
 configopts = '--with-qt=qt5 --without-latex --disable-wxwidgets'
 
 sanity_check_paths = {
diff --git a/easybuild/easyconfigs/g/gnuplot/gnuplot-5.4.8-GCCcore-12.3.0.eb b/easybuild/easyconfigs/g/gnuplot/gnuplot-5.4.8-GCCcore-12.3.0.eb
index f49a0f13ec5..db4fa67aa22 100644
--- a/easybuild/easyconfigs/g/gnuplot/gnuplot-5.4.8-GCCcore-12.3.0.eb
+++ b/easybuild/easyconfigs/g/gnuplot/gnuplot-5.4.8-GCCcore-12.3.0.eb
@@ -33,6 +33,9 @@ dependencies = [
 
 preconfigopts = 'autoreconf && '
 
+# make sure that right Lua library is used (bypassing pkg-config)
+preconfigopts += 'export LUA_CFLAGS="-I$EBROOTLUA/include" && export LUA_LIBS="$EBROOTLUA/lib/liblua.a" && '
+
 configopts = '--with-qt=qt5 --without-latex --disable-wxwidgets'
 
 sanity_check_paths = {