From 2a6befc5d51b71b87f680b5b545cee788cb89a69 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bob=20Dr=C3=B6ge?= Date: Tue, 25 Jun 2024 14:12:56 +0200 Subject: [PATCH 1/3] make sure we pick up EB's 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 + 4 files changed, 4 insertions(+) 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 efff91588b0..f66a2a63bdc 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,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 index c3033c0d080..86b615719ce 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,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 index 1ddf40ec50a..3a9b48f52b0 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,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 index 9504c227680..f51f2edc41a 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,6 +29,7 @@ dependencies = [ ('FriBidi', '1.0.12'), ] +preconfigopts = 'PKG_CONFIG=$EBROOTPKGCONF/bin/pkgconf' configopts = "--with-gslib --with-x" From 2f87100fb961b4450fd7e0eb38c6a238f40b0bf9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bob=20Dr=C3=B6ge?= Date: Tue, 25 Jun 2024 14:13:15 +0200 Subject: [PATCH 2/3] remove blank line --- .../i/ImageMagick/ImageMagick-7.1.1-15-GCCcore-12.3.0.eb | 1 - 1 file changed, 1 deletion(-) 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 f51f2edc41a..a188918a74a 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 @@ -32,7 +32,6 @@ dependencies = [ 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'], From 3e65cdf9c3e41156919e466dc2839bddfe059c8c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bob=20Dr=C3=B6ge?= Date: Tue, 25 Jun 2024 14:13:55 +0200 Subject: [PATCH 3/3] improve sanity checks --- .../i/ImageMagick/ImageMagick-7.1.0-37-GCCcore-11.3.0.eb | 9 ++++++--- .../i/ImageMagick/ImageMagick-7.1.0-4-GCCcore-11.2.0.eb | 9 ++++++--- .../i/ImageMagick/ImageMagick-7.1.0-53-GCCcore-12.2.0.eb | 9 ++++++--- .../i/ImageMagick/ImageMagick-7.1.1-15-GCCcore-12.3.0.eb | 8 ++++++-- 4 files changed, 24 insertions(+), 11 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 f66a2a63bdc..6a78cb9c5a9 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 @@ -34,11 +34,14 @@ 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 index 86b615719ce..7d03b87d1d8 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 @@ -34,11 +34,14 @@ 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 index 3a9b48f52b0..e758d987dfa 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 @@ -34,11 +34,14 @@ 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 index a188918a74a..4fe1068022b 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 @@ -33,10 +33,14 @@ 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'