diff options
| author | Ian Abbott <abbotti@mev.co.uk> | 2017-08-31 12:45:16 +0100 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2017-09-05 08:08:12 +0200 |
| commit | d9ddc890b68aba3105265e439ec8eea4c0c6b922 (patch) | |
| tree | 20b261618a1c638d83bde953fe13562b3a816d2b | |
| parent | 491916aa8808301c220f729585023e971b652049 (diff) | |
| download | ptxdist-d9ddc890b68aba3105265e439ec8eea4c0c6b922.tar.gz ptxdist-d9ddc890b68aba3105265e439ec8eea4c0c6b922.tar.xz | |
host-intltool: fix intltool-update unescaped left brace in regex
intltool-update from intltool-0.50.0 doesn't work with Perl 5.26 (and
possibly other versions later than Perl 5.22), due to "Unescaped left
brace in regex is illegal here" errors. In Perl 5.22 this resulted in
warnings, but they have since been promoted to errors.
For example, building "avahi" fails at the "prepare" stage:
checking for intltool >= 0.35.0... Unescaped left brace in regex is illegal here in regex; marked by <-- HERE in m/^(.*)\${ <-- HERE ?([A-Z_]+)}?(.*)$/ at /home/abbotti/work/ptxdist/projects/dbpod-socfpga-tmp/platform-dbpod-fastpod/sysroot-host/bin/intltool-update line 1064.
found
configure: error: Your intltool is too old. You need intltool 0.35.0 or later.
/mnt/lindata/work/abbotti/ptxdist/ptxdist/ptxdist_git/ptxdist/rules/post/ptxd_make_world_prepare.make:12: recipe for target '/home/abbotti/work/ptxdist/projects/dbpod-socfpga-tmp/platform-dbpod-fastpod/state/avahi.prepare' failed
make: *** [/home/abbotti/work/ptxdist/projects/dbpod-socfpga-tmp/platform-dbpod-fastpod/state/avahi.prepare] Error 1
Apply the same patch as in the mainstream Linux distros to fix it.
Note that if PTXdist updates host-intltool to version 0.51.0, it will
need the same patch.
Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
| -rw-r--r-- | patches/intltool-0.50.0/intltool-perl-5.22.patch | 43 | ||||
| -rw-r--r-- | patches/intltool-0.50.0/series | 1 |
2 files changed, 44 insertions, 0 deletions
diff --git a/patches/intltool-0.50.0/intltool-perl-5.22.patch b/patches/intltool-0.50.0/intltool-perl-5.22.patch new file mode 100644 index 000000000..a23946b39 --- /dev/null +++ b/patches/intltool-0.50.0/intltool-perl-5.22.patch @@ -0,0 +1,43 @@ +--- a/intltool-update.in 2015-03-09 02:39:54.000000000 +0100 ++++ b/intltool-update.in 2015-09-01 11:43:40.595517191 +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? diff --git a/patches/intltool-0.50.0/series b/patches/intltool-0.50.0/series new file mode 100644 index 000000000..f0f2827c4 --- /dev/null +++ b/patches/intltool-0.50.0/series @@ -0,0 +1 @@ +intltool-perl-5.22.patch |