Set PKG_CONFIG variable to pkgconf

Micket · Dec 10, 2024 · da96c0a · da96c0a
1 parent fd283d1
commit da96c0a
Show file tree

Hide file tree

Showing 18 changed files with 24 additions and 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -30,4 +30,6 @@ sanity_check_commands = [
     "pkgconf --help",
 ]
 
+modextravars = {'PKG_CONFIG': '%(installdir)s/bin/pkgconf'}
+
 moduleclass = 'devel'