From da96c0a1b169793af667df008abbcecba92722bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mikael=20=C3=96hman?= <micketeer@gmail.com>
Date: Tue, 10 Dec 2024 23:36:49 +0000
Subject: [PATCH] Set PKG_CONFIG variable to pkgconf

---
 .../i/ImageMagick/ImageMagick-7.1.0-37-GCCcore-11.3.0.eb        | 1 -
 .../i/ImageMagick/ImageMagick-7.1.0-4-GCCcore-11.2.0.eb         | 1 -
 .../i/ImageMagick/ImageMagick-7.1.0-53-GCCcore-12.2.0.eb        | 1 -
 .../i/ImageMagick/ImageMagick-7.1.1-15-GCCcore-12.3.0.eb        | 1 -
 .../i/ImageMagick/ImageMagick-7.1.1-34-GCCcore-13.2.0.eb        | 1 -
 .../i/ImageMagick/ImageMagick-7.1.1-38-GCCcore-13.3.0.eb        | 1 -
 easybuild/easyconfigs/p/pkgconf/pkgconf-1.8.0-GCCcore-10.3.0.eb | 2 ++
 easybuild/easyconfigs/p/pkgconf/pkgconf-1.8.0-GCCcore-11.2.0.eb | 2 ++
 easybuild/easyconfigs/p/pkgconf/pkgconf-1.8.0-GCCcore-11.3.0.eb | 2 ++
 easybuild/easyconfigs/p/pkgconf/pkgconf-1.8.0.eb                | 2 ++
 easybuild/easyconfigs/p/pkgconf/pkgconf-1.9.3-GCCcore-12.2.0.eb | 2 ++
 easybuild/easyconfigs/p/pkgconf/pkgconf-1.9.4-GCCcore-13.1.0.eb | 2 ++
 easybuild/easyconfigs/p/pkgconf/pkgconf-1.9.5-GCCcore-12.3.0.eb | 2 ++
 easybuild/easyconfigs/p/pkgconf/pkgconf-2.0.3-GCCcore-13.2.0.eb | 2 ++
 easybuild/easyconfigs/p/pkgconf/pkgconf-2.2.0-GCCcore-13.3.0.eb | 2 ++
 easybuild/easyconfigs/p/pkgconf/pkgconf-2.2.0.eb                | 2 ++
 easybuild/easyconfigs/p/pkgconf/pkgconf-2.3.0-GCCcore-14.2.0.eb | 2 ++
 easybuild/easyconfigs/p/pkgconf/pkgconf-2.3.0.eb                | 2 ++
 18 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/easybuild/easyconfigs/i/ImageMagick/ImageMagick-7.1.0-37-GCCcore-11.3.0.eb b/easybuild/easyconfigs/i/ImageMagick/ImageMagick-7.1.0-37-GCCcore-11.3.0.eb
index 6a78cb9c5a9..8edbf91b842 100644
--- a/easybuild/easyconfigs/i/ImageMagick/ImageMagick-7.1.0-37-GCCcore-11.3.0.eb
+++ b/easybuild/easyconfigs/i/ImageMagick/ImageMagick-7.1.0-37-GCCcore-11.3.0.eb
@@ -30,7 +30,6 @@ builddependencies = [
     ('pkgconf', '1.8.0'),
 ]
 
-preconfigopts = 'PKG_CONFIG=$EBROOTPKGCONF/bin/pkgconf'
 configopts = "--with-gslib --with-x"
 
 sanity_check_paths = {
diff --git a/easybuild/easyconfigs/i/ImageMagick/ImageMagick-7.1.0-4-GCCcore-11.2.0.eb b/easybuild/easyconfigs/i/ImageMagick/ImageMagick-7.1.0-4-GCCcore-11.2.0.eb
index 7d03b87d1d8..bc63a2d88d1 100644
--- a/easybuild/easyconfigs/i/ImageMagick/ImageMagick-7.1.0-4-GCCcore-11.2.0.eb
+++ b/easybuild/easyconfigs/i/ImageMagick/ImageMagick-7.1.0-4-GCCcore-11.2.0.eb
@@ -30,7 +30,6 @@ builddependencies = [
     ('pkg-config', '0.29.2'),
 ]
 
-preconfigopts = 'PKG_CONFIG=$EBROOTPKGCONF/bin/pkgconf'
 configopts = "--with-gslib --with-x"
 
 sanity_check_paths = {
diff --git a/easybuild/easyconfigs/i/ImageMagick/ImageMagick-7.1.0-53-GCCcore-12.2.0.eb b/easybuild/easyconfigs/i/ImageMagick/ImageMagick-7.1.0-53-GCCcore-12.2.0.eb
index e758d987dfa..ee6ed5c39bd 100644
--- a/easybuild/easyconfigs/i/ImageMagick/ImageMagick-7.1.0-53-GCCcore-12.2.0.eb
+++ b/easybuild/easyconfigs/i/ImageMagick/ImageMagick-7.1.0-53-GCCcore-12.2.0.eb
@@ -30,7 +30,6 @@ builddependencies = [
     ('pkgconf', '1.9.3'),
 ]
 
-preconfigopts = 'PKG_CONFIG=$EBROOTPKGCONF/bin/pkgconf'
 configopts = "--with-gslib --with-x"
 
 sanity_check_paths = {
diff --git a/easybuild/easyconfigs/i/ImageMagick/ImageMagick-7.1.1-15-GCCcore-12.3.0.eb b/easybuild/easyconfigs/i/ImageMagick/ImageMagick-7.1.1-15-GCCcore-12.3.0.eb
index 4fe1068022b..ebe2bb56629 100644
--- a/easybuild/easyconfigs/i/ImageMagick/ImageMagick-7.1.1-15-GCCcore-12.3.0.eb
+++ b/easybuild/easyconfigs/i/ImageMagick/ImageMagick-7.1.1-15-GCCcore-12.3.0.eb
@@ -29,7 +29,6 @@ dependencies = [
     ('FriBidi', '1.0.12'),
 ]
 
-preconfigopts = 'PKG_CONFIG=$EBROOTPKGCONF/bin/pkgconf'
 configopts = "--with-gslib --with-x"
 
 sanity_check_paths = {
diff --git a/easybuild/easyconfigs/i/ImageMagick/ImageMagick-7.1.1-34-GCCcore-13.2.0.eb b/easybuild/easyconfigs/i/ImageMagick/ImageMagick-7.1.1-34-GCCcore-13.2.0.eb
index 2ccdcb32a55..eaa7378dd71 100644
--- a/easybuild/easyconfigs/i/ImageMagick/ImageMagick-7.1.1-34-GCCcore-13.2.0.eb
+++ b/easybuild/easyconfigs/i/ImageMagick/ImageMagick-7.1.1-34-GCCcore-13.2.0.eb
@@ -29,7 +29,6 @@ dependencies = [
     ('FriBidi', '1.0.13'),
 ]
 
-preconfigopts = 'PKG_CONFIG=$EBROOTPKGCONF/bin/pkgconf'
 configopts = "--with-gslib --with-x"
 
 sanity_check_paths = {
diff --git a/easybuild/easyconfigs/i/ImageMagick/ImageMagick-7.1.1-38-GCCcore-13.3.0.eb b/easybuild/easyconfigs/i/ImageMagick/ImageMagick-7.1.1-38-GCCcore-13.3.0.eb
index 776471b14b2..27142117380 100644
--- a/easybuild/easyconfigs/i/ImageMagick/ImageMagick-7.1.1-38-GCCcore-13.3.0.eb
+++ b/easybuild/easyconfigs/i/ImageMagick/ImageMagick-7.1.1-38-GCCcore-13.3.0.eb
@@ -33,7 +33,6 @@ dependencies = [
     ('FriBidi', '1.0.15'),
 ]
 
-preconfigopts = 'PKG_CONFIG=$EBROOTPKGCONF/bin/pkgconf'
 configopts = "--with-gslib --with-x"
 
 sanity_check_paths = {
diff --git a/easybuild/easyconfigs/p/pkgconf/pkgconf-1.8.0-GCCcore-10.3.0.eb b/easybuild/easyconfigs/p/pkgconf/pkgconf-1.8.0-GCCcore-10.3.0.eb
index fa7cf70d46b..6c763def290 100644
--- a/easybuild/easyconfigs/p/pkgconf/pkgconf-1.8.0-GCCcore-10.3.0.eb
+++ b/easybuild/easyconfigs/p/pkgconf/pkgconf-1.8.0-GCCcore-10.3.0.eb
@@ -28,4 +28,6 @@ sanity_check_commands = [
     "pkgconf --help",
 ]
 
+modextravars = {'PKG_CONFIG': '%(installdir)s/bin/pkgconf'}
+
 moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/p/pkgconf/pkgconf-1.8.0-GCCcore-11.2.0.eb b/easybuild/easyconfigs/p/pkgconf/pkgconf-1.8.0-GCCcore-11.2.0.eb
index 0d6dab08f33..acd1f2251ec 100644
--- a/easybuild/easyconfigs/p/pkgconf/pkgconf-1.8.0-GCCcore-11.2.0.eb
+++ b/easybuild/easyconfigs/p/pkgconf/pkgconf-1.8.0-GCCcore-11.2.0.eb
@@ -28,4 +28,6 @@ sanity_check_commands = [
     "pkgconf --help",
 ]
 
+modextravars = {'PKG_CONFIG': '%(installdir)s/bin/pkgconf'}
+
 moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/p/pkgconf/pkgconf-1.8.0-GCCcore-11.3.0.eb b/easybuild/easyconfigs/p/pkgconf/pkgconf-1.8.0-GCCcore-11.3.0.eb
index cffdf67d1da..3e82ba18c42 100644
--- a/easybuild/easyconfigs/p/pkgconf/pkgconf-1.8.0-GCCcore-11.3.0.eb
+++ b/easybuild/easyconfigs/p/pkgconf/pkgconf-1.8.0-GCCcore-11.3.0.eb
@@ -28,4 +28,6 @@ sanity_check_commands = [
     "pkgconf --help",
 ]
 
+modextravars = {'PKG_CONFIG': '%(installdir)s/bin/pkgconf'}
+
 moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/p/pkgconf/pkgconf-1.8.0.eb b/easybuild/easyconfigs/p/pkgconf/pkgconf-1.8.0.eb
index 710f2739928..1c340a27259 100644
--- a/easybuild/easyconfigs/p/pkgconf/pkgconf-1.8.0.eb
+++ b/easybuild/easyconfigs/p/pkgconf/pkgconf-1.8.0.eb
@@ -30,4 +30,6 @@ sanity_check_commands = [
     "pkgconf --help",
 ]
 
+modextravars = {'PKG_CONFIG': '%(installdir)s/bin/pkgconf'}
+
 moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/p/pkgconf/pkgconf-1.9.3-GCCcore-12.2.0.eb b/easybuild/easyconfigs/p/pkgconf/pkgconf-1.9.3-GCCcore-12.2.0.eb
index 2d47decfa86..05cf64168ab 100644
--- a/easybuild/easyconfigs/p/pkgconf/pkgconf-1.9.3-GCCcore-12.2.0.eb
+++ b/easybuild/easyconfigs/p/pkgconf/pkgconf-1.9.3-GCCcore-12.2.0.eb
@@ -28,4 +28,6 @@ sanity_check_commands = [
     "pkgconf --help",
 ]
 
+modextravars = {'PKG_CONFIG': '%(installdir)s/bin/pkgconf'}
+
 moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/p/pkgconf/pkgconf-1.9.4-GCCcore-13.1.0.eb b/easybuild/easyconfigs/p/pkgconf/pkgconf-1.9.4-GCCcore-13.1.0.eb
index c80ab34d708..3f7c00ed2d2 100644
--- a/easybuild/easyconfigs/p/pkgconf/pkgconf-1.9.4-GCCcore-13.1.0.eb
+++ b/easybuild/easyconfigs/p/pkgconf/pkgconf-1.9.4-GCCcore-13.1.0.eb
@@ -28,4 +28,6 @@ sanity_check_commands = [
     "pkgconf --help",
 ]
 
+modextravars = {'PKG_CONFIG': '%(installdir)s/bin/pkgconf'}
+
 moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/p/pkgconf/pkgconf-1.9.5-GCCcore-12.3.0.eb b/easybuild/easyconfigs/p/pkgconf/pkgconf-1.9.5-GCCcore-12.3.0.eb
index 1896354cb61..87bf0c0e104 100644
--- a/easybuild/easyconfigs/p/pkgconf/pkgconf-1.9.5-GCCcore-12.3.0.eb
+++ b/easybuild/easyconfigs/p/pkgconf/pkgconf-1.9.5-GCCcore-12.3.0.eb
@@ -28,4 +28,6 @@ sanity_check_commands = [
     "pkgconf --help",
 ]
 
+modextravars = {'PKG_CONFIG': '%(installdir)s/bin/pkgconf'}
+
 moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/p/pkgconf/pkgconf-2.0.3-GCCcore-13.2.0.eb b/easybuild/easyconfigs/p/pkgconf/pkgconf-2.0.3-GCCcore-13.2.0.eb
index a9a638fa1ef..5a81ceda025 100644
--- a/easybuild/easyconfigs/p/pkgconf/pkgconf-2.0.3-GCCcore-13.2.0.eb
+++ b/easybuild/easyconfigs/p/pkgconf/pkgconf-2.0.3-GCCcore-13.2.0.eb
@@ -28,4 +28,6 @@ sanity_check_commands = [
     "pkgconf --help",
 ]
 
+modextravars = {'PKG_CONFIG': '%(installdir)s/bin/pkgconf'}
+
 moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/p/pkgconf/pkgconf-2.2.0-GCCcore-13.3.0.eb b/easybuild/easyconfigs/p/pkgconf/pkgconf-2.2.0-GCCcore-13.3.0.eb
index aaaecf30a9a..8294511f61a 100644
--- a/easybuild/easyconfigs/p/pkgconf/pkgconf-2.2.0-GCCcore-13.3.0.eb
+++ b/easybuild/easyconfigs/p/pkgconf/pkgconf-2.2.0-GCCcore-13.3.0.eb
@@ -28,4 +28,6 @@ sanity_check_commands = [
     "pkgconf --help",
 ]
 
+modextravars = {'PKG_CONFIG': '%(installdir)s/bin/pkgconf'}
+
 moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/p/pkgconf/pkgconf-2.2.0.eb b/easybuild/easyconfigs/p/pkgconf/pkgconf-2.2.0.eb
index 3440e388cc3..5c877cef741 100644
--- a/easybuild/easyconfigs/p/pkgconf/pkgconf-2.2.0.eb
+++ b/easybuild/easyconfigs/p/pkgconf/pkgconf-2.2.0.eb
@@ -30,4 +30,6 @@ sanity_check_commands = [
     "pkgconf --help",
 ]
 
+modextravars = {'PKG_CONFIG': '%(installdir)s/bin/pkgconf'}
+
 moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/p/pkgconf/pkgconf-2.3.0-GCCcore-14.2.0.eb b/easybuild/easyconfigs/p/pkgconf/pkgconf-2.3.0-GCCcore-14.2.0.eb
index de13aa5fb33..76421187079 100644
--- a/easybuild/easyconfigs/p/pkgconf/pkgconf-2.3.0-GCCcore-14.2.0.eb
+++ b/easybuild/easyconfigs/p/pkgconf/pkgconf-2.3.0-GCCcore-14.2.0.eb
@@ -28,4 +28,6 @@ sanity_check_commands = [
     "pkgconf --help",
 ]
 
+modextravars = {'PKG_CONFIG': '%(installdir)s/bin/pkgconf'}
+
 moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/p/pkgconf/pkgconf-2.3.0.eb b/easybuild/easyconfigs/p/pkgconf/pkgconf-2.3.0.eb
index c90cecda0a1..b06a5414e80 100644
--- a/easybuild/easyconfigs/p/pkgconf/pkgconf-2.3.0.eb
+++ b/easybuild/easyconfigs/p/pkgconf/pkgconf-2.3.0.eb
@@ -30,4 +30,6 @@ sanity_check_commands = [
     "pkgconf --help",
 ]
 
+modextravars = {'PKG_CONFIG': '%(installdir)s/bin/pkgconf'}
+
 moduleclass = 'devel'