Merge pull request easybuilders#20900 from bedroge/imagemagick_pkgconf

make sure that recent ImageMagick versions pick up the right pkgconf and improve the sanity checks
bartoldeman · Jun 25, 2024 · 08956f7 · 08956f7
2 parents 9ded330 + 3e65cdf
commit 08956f7
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 12 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,14 +30,18 @@ builddependencies = [
     ('pkgconf', '1.8.0'),
 ]
 
+preconfigopts = 'PKG_CONFIG=$EBROOTPKGCONF/bin/pkgconf'
 configopts = "--with-gslib --with-x"
 
 sanity_check_paths = {
-    'files': [],
-    'dirs': ['bin', 'etc/%(name)s-%(version_major)s',
-             'include/%(name)s-%(version_major)s', 'lib', 'share'],
+    'files': ['bin/magick'],
+    'dirs': ['etc/%(name)s-%(version_major)s', 'include/%(name)s-%(version_major)s', 'lib', 'share'],
 }
 
+sanity_check_commands = [
+    'magick --help',
+]
+
 modextravars = {'MAGICK_HOME': '%(installdir)s'}
 
 moduleclass = 'vis'
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,14 +30,18 @@ builddependencies = [
     ('pkg-config', '0.29.2'),
 ]
 
+preconfigopts = 'PKG_CONFIG=$EBROOTPKGCONF/bin/pkgconf'
 configopts = "--with-gslib --with-x"
 
 sanity_check_paths = {
-    'files': [],
-    'dirs': ['bin', 'etc/%(name)s-%(version_major)s',
-             'include/%(name)s-%(version_major)s', 'lib', 'share'],
+    'files': ['bin/magick'],
+    'dirs': ['etc/%(name)s-%(version_major)s', 'include/%(name)s-%(version_major)s', 'lib', 'share'],
 }
 
+sanity_check_commands = [
+    'magick --help',
+]
+
 modextravars = {'MAGICK_HOME': '%(installdir)s'}
 
 moduleclass = 'vis'
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,14 +30,18 @@ builddependencies = [
     ('pkgconf', '1.9.3'),
 ]
 
+preconfigopts = 'PKG_CONFIG=$EBROOTPKGCONF/bin/pkgconf'
 configopts = "--with-gslib --with-x"
 
 sanity_check_paths = {
-    'files': [],
-    'dirs': ['bin', 'etc/%(name)s-%(version_major)s',
-             'include/%(name)s-%(version_major)s', 'lib', 'share'],
+    'files': ['bin/magick'],
+    'dirs': ['etc/%(name)s-%(version_major)s', 'include/%(name)s-%(version_major)s', 'lib', 'share'],
 }
 
+sanity_check_commands = [
+    'magick --help',
+]
+
 modextravars = {'MAGICK_HOME': '%(installdir)s'}
 
 moduleclass = 'vis'
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,14 +29,18 @@ dependencies = [
     ('FriBidi', '1.0.12'),
 ]
 
+preconfigopts = 'PKG_CONFIG=$EBROOTPKGCONF/bin/pkgconf'
 configopts = "--with-gslib --with-x"
 
-
 sanity_check_paths = {
-    'files': [],
-    'dirs': ['bin', 'etc/%(name)s-%(version_major)s', 'include/%(name)s-%(version_major)s', 'lib', 'share'],
+    'files': ['bin/magick'],
+    'dirs': ['etc/%(name)s-%(version_major)s', 'include/%(name)s-%(version_major)s', 'lib', 'share'],
 }
 
+sanity_check_commands = [
+    'magick --help',
+]
+
 modextravars = {'MAGICK_HOME': '%(installdir)s'}
 
 moduleclass = 'vis'