make sure we pick up EB's pkgconf

bedroge · Jun 25, 2024 · 2a6befc · 2a6befc
1 parent 9ded330
commit 2a6befc
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 0 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,6 +30,7 @@ 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,6 +30,7 @@ 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,6 +30,7 @@ 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,6 +29,7 @@ dependencies = [
     ('FriBidi', '1.0.12'),
 ]
 
+preconfigopts = 'PKG_CONFIG=$EBROOTPKGCONF/bin/pkgconf'
 configopts = "--with-gslib --with-x"
-Original file line number
+Diff line change
@@ Expand Up / @@ -29,6 +29,7 @@ dependencies = [ @@
         ('FriBidi', '1.0.12'),
     ]
+    preconfigopts = 'PKG_CONFIG=$EBROOTPKGCONF/bin/pkgconf'
     configopts = "--with-gslib --with-x"
@@ Expand Down @@