From 2969dbd820053d58ad523ec93a259a7378dcb150 Mon Sep 17 00:00:00 2001 From: reedts Date: Fri, 3 Nov 2017 11:17:06 +0100 Subject: [PATCH 1/4] intltool 0.51.0 and patch to fix error in regular expression when using Perl 5.26.0 --- ...tltool-0.51.0-GCCcore-6.4.0-Perl-5.26.0.eb | 32 ++++++++++++++ .../intltool/perl-5.26.0-compatibility.patch | 43 +++++++++++++++++++ 2 files changed, 75 insertions(+) create mode 100644 easybuild/easyconfigs/i/intltool/intltool-0.51.0-GCCcore-6.4.0-Perl-5.26.0.eb create mode 100644 easybuild/easyconfigs/i/intltool/perl-5.26.0-compatibility.patch diff --git a/easybuild/easyconfigs/i/intltool/intltool-0.51.0-GCCcore-6.4.0-Perl-5.26.0.eb b/easybuild/easyconfigs/i/intltool/intltool-0.51.0-GCCcore-6.4.0-Perl-5.26.0.eb new file mode 100644 index 000000000000..fa236b72f7d3 --- /dev/null +++ b/easybuild/easyconfigs/i/intltool/intltool-0.51.0-GCCcore-6.4.0-Perl-5.26.0.eb @@ -0,0 +1,32 @@ +easyblock = 'ConfigureMake' + +name = 'intltool' +version = '0.51.0' +versionsuffix = '-Perl-5.26.0' + +homepage = 'http://freedesktop.org/wiki/Software/intltool/' +description = """intltool is a set of tools to centralize translation of + many different file formats using GNU gettext-compatible PO files.""" + +toolchain = {'name': 'GCCcore', 'version': '6.4.0'} + +source_urls = ['http://launchpad.net/intltool/trunk/%(version)s/+download/'] +sources = [SOURCE_TAR_GZ] +checksums = ['67c74d94196b153b774ab9f89b2fa6c6ba79352407037c8c14d5aeb334e959cd'] + +builddependencies = [ + ('binutils', '2.28'), +] + +dependencies = [ + ('XML-Parser', '2.44_01', versionsuffix), +] + +patches = ['perl-5.26.0-compatibility.patch'] + +sanity_check_paths = { + 'files': ['bin/intltool%s' % x for x in ['-extract', '-merge', '-prepare', '-update', 'ize']], + 'dirs': [] +} + +moduleclass = 'devel' diff --git a/easybuild/easyconfigs/i/intltool/perl-5.26.0-compatibility.patch b/easybuild/easyconfigs/i/intltool/perl-5.26.0-compatibility.patch new file mode 100644 index 000000000000..50ee42745693 --- /dev/null +++ b/easybuild/easyconfigs/i/intltool/perl-5.26.0-compatibility.patch @@ -0,0 +1,43 @@ +--- intltool-0.51.0.orig/intltool-update.in 2015-03-09 02:39:54.000000000 +0100 ++++ intltool-0.51.0.orig/intltool-update.in 2015-06-19 01:52:07.171228154 +0200 +@@ -1062,7 +1062,7 @@ + } + } + +- if ($str =~ /^(.*)\${?([A-Z_]+)}?(.*)$/) ++ if ($str =~ /^(.*)\$\{?([A-Z_]+)}?(.*)$/) + { + my $rest = $3; + my $untouched = $1; +@@ -1190,10 +1190,10 @@ + $name =~ s/\(+$//g; + $version =~ s/\(+$//g; + +- $varhash{"PACKAGE_NAME"} = $name if (not $name =~ /\${?AC_PACKAGE_NAME}?/); +- $varhash{"PACKAGE"} = $name if (not $name =~ /\${?PACKAGE}?/); +- $varhash{"PACKAGE_VERSION"} = $version if (not $name =~ /\${?AC_PACKAGE_VERSION}?/); +- $varhash{"VERSION"} = $version if (not $name =~ /\${?VERSION}?/); ++ $varhash{"PACKAGE_NAME"} = $name if (not $name =~ /\$\{?AC_PACKAGE_NAME}?/); ++ $varhash{"PACKAGE"} = $name if (not $name =~ /\$\{?PACKAGE}?/); ++ $varhash{"PACKAGE_VERSION"} = $version if (not $name =~ /\$\{?AC_PACKAGE_VERSION}?/); ++ $varhash{"VERSION"} = $version if (not $name =~ /\$\{?VERSION}?/); + } + + if ($conf_source =~ /^AC_INIT\(([^,\)]+),([^,\)]+)[,]?([^,\)]+)?/m) +@@ -1219,11 +1219,11 @@ + $version =~ s/\(+$//g; + $bugurl =~ s/\(+$//g if (defined $bugurl); + +- $varhash{"PACKAGE_NAME"} = $name if (not $name =~ /\${?AC_PACKAGE_NAME}?/); +- $varhash{"PACKAGE"} = $name if (not $name =~ /\${?PACKAGE}?/); +- $varhash{"PACKAGE_VERSION"} = $version if (not $name =~ /\${?AC_PACKAGE_VERSION}?/); +- $varhash{"VERSION"} = $version if (not $name =~ /\${?VERSION}?/); +- $varhash{"PACKAGE_BUGREPORT"} = $bugurl if (defined $bugurl and not $bugurl =~ /\${?\w+}?/); ++ $varhash{"PACKAGE_NAME"} = $name if (not $name =~ /\$\{?AC_PACKAGE_NAME}?/); ++ $varhash{"PACKAGE"} = $name if (not $name =~ /\$\{?PACKAGE}?/); ++ $varhash{"PACKAGE_VERSION"} = $version if (not $name =~ /\$\{?AC_PACKAGE_VERSION}?/); ++ $varhash{"VERSION"} = $version if (not $name =~ /\$\{?VERSION}?/); ++ $varhash{"PACKAGE_BUGREPORT"} = $bugurl if (defined $bugurl and not $bugurl =~ /\$\{?\w+}?/); + } + +# \s makes this not work, why? From 2866fa586b487c3f1a3924f5e75d8d8a38182a74 Mon Sep 17 00:00:00 2001 From: reedts Date: Tue, 7 Nov 2017 10:50:34 +0100 Subject: [PATCH 2/4] Updated to toolchain version 2018.00 and added infos on patch --- ...tltool-0.51.0-GCCcore-6.4.0-Perl-5.26.0.eb | 6 ++- .../intltool-perl-5.26.0-fix-regex.patch | 47 +++++++++++++++++++ 2 files changed, 52 insertions(+), 1 deletion(-) create mode 100644 easybuild/easyconfigs/i/intltool/intltool-perl-5.26.0-fix-regex.patch diff --git a/easybuild/easyconfigs/i/intltool/intltool-0.51.0-GCCcore-6.4.0-Perl-5.26.0.eb b/easybuild/easyconfigs/i/intltool/intltool-0.51.0-GCCcore-6.4.0-Perl-5.26.0.eb index fa236b72f7d3..7fdf4173e3a2 100644 --- a/easybuild/easyconfigs/i/intltool/intltool-0.51.0-GCCcore-6.4.0-Perl-5.26.0.eb +++ b/easybuild/easyconfigs/i/intltool/intltool-0.51.0-GCCcore-6.4.0-Perl-5.26.0.eb @@ -22,7 +22,11 @@ dependencies = [ ('XML-Parser', '2.44_01', versionsuffix), ] -patches = ['perl-5.26.0-compatibility.patch'] +# intltool bug with Perl 5.26 +# https://bugs.launchpad.net/intltool/+bug/1696658 +# This patch ist from: +# https://github.com/Alexpux/MSYS2-packages/blob/master/intltool/perl-5.22-compatibility.patch +patches = ['intltool-perl-5.26.0-fix-regex.patch'] sanity_check_paths = { 'files': ['bin/intltool%s' % x for x in ['-extract', '-merge', '-prepare', '-update', 'ize']], diff --git a/easybuild/easyconfigs/i/intltool/intltool-perl-5.26.0-fix-regex.patch b/easybuild/easyconfigs/i/intltool/intltool-perl-5.26.0-fix-regex.patch new file mode 100644 index 000000000000..b07145071a41 --- /dev/null +++ b/easybuild/easyconfigs/i/intltool/intltool-perl-5.26.0-fix-regex.patch @@ -0,0 +1,47 @@ +# intltool bug with Perl 5.26 +# https://bugs.launchpad.net/intltool/+bug/1696658 +# This patch ist from: +# https://github.com/Alexpux/MSYS2-packages/blob/master/intltool/perl-5.22-compatibility.patch +--- intltool-0.51.0.orig/intltool-update.in 2015-03-09 02:39:54.000000000 +0100 ++++ intltool-0.51.0.orig/intltool-update.in 2015-06-19 01:52:07.171228154 +0200 +@@ -1062,7 +1062,7 @@ + } + } + +- if ($str =~ /^(.*)\${?([A-Z_]+)}?(.*)$/) ++ if ($str =~ /^(.*)\$\{?([A-Z_]+)}?(.*)$/) + { + my $rest = $3; + my $untouched = $1; +@@ -1190,10 +1190,10 @@ + $name =~ s/\(+$//g; + $version =~ s/\(+$//g; + +- $varhash{"PACKAGE_NAME"} = $name if (not $name =~ /\${?AC_PACKAGE_NAME}?/); +- $varhash{"PACKAGE"} = $name if (not $name =~ /\${?PACKAGE}?/); +- $varhash{"PACKAGE_VERSION"} = $version if (not $name =~ /\${?AC_PACKAGE_VERSION}?/); +- $varhash{"VERSION"} = $version if (not $name =~ /\${?VERSION}?/); ++ $varhash{"PACKAGE_NAME"} = $name if (not $name =~ /\$\{?AC_PACKAGE_NAME}?/); ++ $varhash{"PACKAGE"} = $name if (not $name =~ /\$\{?PACKAGE}?/); ++ $varhash{"PACKAGE_VERSION"} = $version if (not $name =~ /\$\{?AC_PACKAGE_VERSION}?/); ++ $varhash{"VERSION"} = $version if (not $name =~ /\$\{?VERSION}?/); + } + + if ($conf_source =~ /^AC_INIT\(([^,\)]+),([^,\)]+)[,]?([^,\)]+)?/m) +@@ -1219,11 +1219,11 @@ + $version =~ s/\(+$//g; + $bugurl =~ s/\(+$//g if (defined $bugurl); + +- $varhash{"PACKAGE_NAME"} = $name if (not $name =~ /\${?AC_PACKAGE_NAME}?/); +- $varhash{"PACKAGE"} = $name if (not $name =~ /\${?PACKAGE}?/); +- $varhash{"PACKAGE_VERSION"} = $version if (not $name =~ /\${?AC_PACKAGE_VERSION}?/); +- $varhash{"VERSION"} = $version if (not $name =~ /\${?VERSION}?/); +- $varhash{"PACKAGE_BUGREPORT"} = $bugurl if (defined $bugurl and not $bugurl =~ /\${?\w+}?/); ++ $varhash{"PACKAGE_NAME"} = $name if (not $name =~ /\$\{?AC_PACKAGE_NAME}?/); ++ $varhash{"PACKAGE"} = $name if (not $name =~ /\$\{?PACKAGE}?/); ++ $varhash{"PACKAGE_VERSION"} = $version if (not $name =~ /\$\{?AC_PACKAGE_VERSION}?/); ++ $varhash{"VERSION"} = $version if (not $name =~ /\$\{?VERSION}?/); ++ $varhash{"PACKAGE_BUGREPORT"} = $bugurl if (defined $bugurl and not $bugurl =~ /\$\{?\w+}?/); + } + +# \s makes this not work, why? From b6591e97cc34689e263f996d7f44430efca413ca Mon Sep 17 00:00:00 2001 From: reedts Date: Tue, 7 Nov 2017 10:55:43 +0100 Subject: [PATCH 3/4] Removed duplicated patch file --- .../intltool/perl-5.26.0-compatibility.patch | 43 ------------------- 1 file changed, 43 deletions(-) delete mode 100644 easybuild/easyconfigs/i/intltool/perl-5.26.0-compatibility.patch diff --git a/easybuild/easyconfigs/i/intltool/perl-5.26.0-compatibility.patch b/easybuild/easyconfigs/i/intltool/perl-5.26.0-compatibility.patch deleted file mode 100644 index 50ee42745693..000000000000 --- a/easybuild/easyconfigs/i/intltool/perl-5.26.0-compatibility.patch +++ /dev/null @@ -1,43 +0,0 @@ ---- intltool-0.51.0.orig/intltool-update.in 2015-03-09 02:39:54.000000000 +0100 -+++ intltool-0.51.0.orig/intltool-update.in 2015-06-19 01:52:07.171228154 +0200 -@@ -1062,7 +1062,7 @@ - } - } - -- if ($str =~ /^(.*)\${?([A-Z_]+)}?(.*)$/) -+ if ($str =~ /^(.*)\$\{?([A-Z_]+)}?(.*)$/) - { - my $rest = $3; - my $untouched = $1; -@@ -1190,10 +1190,10 @@ - $name =~ s/\(+$//g; - $version =~ s/\(+$//g; - -- $varhash{"PACKAGE_NAME"} = $name if (not $name =~ /\${?AC_PACKAGE_NAME}?/); -- $varhash{"PACKAGE"} = $name if (not $name =~ /\${?PACKAGE}?/); -- $varhash{"PACKAGE_VERSION"} = $version if (not $name =~ /\${?AC_PACKAGE_VERSION}?/); -- $varhash{"VERSION"} = $version if (not $name =~ /\${?VERSION}?/); -+ $varhash{"PACKAGE_NAME"} = $name if (not $name =~ /\$\{?AC_PACKAGE_NAME}?/); -+ $varhash{"PACKAGE"} = $name if (not $name =~ /\$\{?PACKAGE}?/); -+ $varhash{"PACKAGE_VERSION"} = $version if (not $name =~ /\$\{?AC_PACKAGE_VERSION}?/); -+ $varhash{"VERSION"} = $version if (not $name =~ /\$\{?VERSION}?/); - } - - if ($conf_source =~ /^AC_INIT\(([^,\)]+),([^,\)]+)[,]?([^,\)]+)?/m) -@@ -1219,11 +1219,11 @@ - $version =~ s/\(+$//g; - $bugurl =~ s/\(+$//g if (defined $bugurl); - -- $varhash{"PACKAGE_NAME"} = $name if (not $name =~ /\${?AC_PACKAGE_NAME}?/); -- $varhash{"PACKAGE"} = $name if (not $name =~ /\${?PACKAGE}?/); -- $varhash{"PACKAGE_VERSION"} = $version if (not $name =~ /\${?AC_PACKAGE_VERSION}?/); -- $varhash{"VERSION"} = $version if (not $name =~ /\${?VERSION}?/); -- $varhash{"PACKAGE_BUGREPORT"} = $bugurl if (defined $bugurl and not $bugurl =~ /\${?\w+}?/); -+ $varhash{"PACKAGE_NAME"} = $name if (not $name =~ /\$\{?AC_PACKAGE_NAME}?/); -+ $varhash{"PACKAGE"} = $name if (not $name =~ /\$\{?PACKAGE}?/); -+ $varhash{"PACKAGE_VERSION"} = $version if (not $name =~ /\$\{?AC_PACKAGE_VERSION}?/); -+ $varhash{"VERSION"} = $version if (not $name =~ /\$\{?VERSION}?/); -+ $varhash{"PACKAGE_BUGREPORT"} = $bugurl if (defined $bugurl and not $bugurl =~ /\$\{?\w+}?/); - } - -# \s makes this not work, why? From 9d933891fe37b650214a6b5d19fa05a9f7f7e516 Mon Sep 17 00:00:00 2001 From: reedts Date: Tue, 7 Nov 2017 11:26:43 +0100 Subject: [PATCH 4/4] Removed unnecessary comments from easyconfig and fix name of patch file --- .../i/intltool/intltool-0.51.0-GCCcore-6.4.0-Perl-5.26.0.eb | 6 +----- ...fix-regex.patch => intltool-0.51.0-Perl-fix-regex.patch} | 0 2 files changed, 1 insertion(+), 5 deletions(-) rename easybuild/easyconfigs/i/intltool/{intltool-perl-5.26.0-fix-regex.patch => intltool-0.51.0-Perl-fix-regex.patch} (100%) diff --git a/easybuild/easyconfigs/i/intltool/intltool-0.51.0-GCCcore-6.4.0-Perl-5.26.0.eb b/easybuild/easyconfigs/i/intltool/intltool-0.51.0-GCCcore-6.4.0-Perl-5.26.0.eb index 7fdf4173e3a2..a9c65e1b49bb 100644 --- a/easybuild/easyconfigs/i/intltool/intltool-0.51.0-GCCcore-6.4.0-Perl-5.26.0.eb +++ b/easybuild/easyconfigs/i/intltool/intltool-0.51.0-GCCcore-6.4.0-Perl-5.26.0.eb @@ -22,11 +22,7 @@ dependencies = [ ('XML-Parser', '2.44_01', versionsuffix), ] -# intltool bug with Perl 5.26 -# https://bugs.launchpad.net/intltool/+bug/1696658 -# This patch ist from: -# https://github.com/Alexpux/MSYS2-packages/blob/master/intltool/perl-5.22-compatibility.patch -patches = ['intltool-perl-5.26.0-fix-regex.patch'] +patches = ['intltool-%(version)s-Perl-fix-regex.patch'] sanity_check_paths = { 'files': ['bin/intltool%s' % x for x in ['-extract', '-merge', '-prepare', '-update', 'ize']], diff --git a/easybuild/easyconfigs/i/intltool/intltool-perl-5.26.0-fix-regex.patch b/easybuild/easyconfigs/i/intltool/intltool-0.51.0-Perl-fix-regex.patch similarity index 100% rename from easybuild/easyconfigs/i/intltool/intltool-perl-5.26.0-fix-regex.patch rename to easybuild/easyconfigs/i/intltool/intltool-0.51.0-Perl-fix-regex.patch