From fd456235952a134a12236bc98f892ced849f54f3 Mon Sep 17 00:00:00 2001 From: Jernej Skrabec Date: Tue, 10 Oct 2017 20:47:37 +0200 Subject: [PATCH 1/3] intltool: Fix building with perl 5.26 Signed-off-by: Jernej Skrabec --- .../intltool-0001-fix-regex-expressions.patch | 45 +++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 packages/devel/intltool/patches/intltool-0001-fix-regex-expressions.patch diff --git a/packages/devel/intltool/patches/intltool-0001-fix-regex-expressions.patch b/packages/devel/intltool/patches/intltool-0001-fix-regex-expressions.patch new file mode 100644 index 0000000000..dcf9105427 --- /dev/null +++ b/packages/devel/intltool/patches/intltool-0001-fix-regex-expressions.patch @@ -0,0 +1,45 @@ +=== modified file 'intltool-update.in' +--- a/intltool-update.in 2014-05-14 02:15:53 +0000 ++++ b/intltool-update.in 2016-01-19 15:59:38 +0000 +@@ -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 e59dd5022490c5cf5778b29328ddc0d768ff7a44 Mon Sep 17 00:00:00 2001 From: Jernej Skrabec Date: Tue, 10 Oct 2017 20:45:01 +0200 Subject: [PATCH 2/3] automake: Bump version to 1.15.1 Signed-off-by: Jernej Skrabec --- packages/devel/automake/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/devel/automake/package.mk b/packages/devel/automake/package.mk index 4fa00f7218..bcd1a0c391 100644 --- a/packages/devel/automake/package.mk +++ b/packages/devel/automake/package.mk @@ -17,8 +17,8 @@ ################################################################################ PKG_NAME="automake" -PKG_VERSION="1.15" -PKG_SHA256="9908c75aabd49d13661d6dcb1bc382252d22cc77bf733a2d55e87f2aa2db8636" +PKG_VERSION="1.15.1" +PKG_SHA256="af6ba39142220687c500f79b4aa2f181d9b24e4f8d8ec497cea4ba26c64bedaf" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="http://sources.redhat.com/automake/" From cfcb300e28d985afd7b02d0fd81d9b3a83d53148 Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Sun, 15 Oct 2017 01:50:19 +0100 Subject: [PATCH 3/3] buildsystem: allow autoreconf on libtool Running autoreconf on libtool is necessary after bumping to automake 1.15.1. Build intltool before libtool. Since libtool installs libtoolize, don't run --install whenever libtoolize isn't yet installed. --- config/functions | 6 +++++- packages/devel/libtool/package.mk | 2 +- packages/virtual/autotools/package.mk | 2 +- packages/virtual/toolchain/package.mk | 2 +- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/config/functions b/config/functions index 057254790b..7ce4741dc1 100644 --- a/config/functions +++ b/config/functions @@ -372,7 +372,11 @@ do_autoreconf() { if [ -e "$TOOLCHAIN/bin/autoreconf" -a -e "$INTLTOOLIZE" ]; then mkdir -p $ACLOCAL_DIR - export AUTORECONF="$TOOLCHAIN/bin/autoreconf --verbose --force --install -I $ACLOCAL_DIR" + if [ -e "$LIBTOOLIZE" ]; then + export AUTORECONF="$TOOLCHAIN/bin/autoreconf --verbose --force --install -I $ACLOCAL_DIR" + else + export AUTORECONF="$TOOLCHAIN/bin/autoreconf --verbose --force -I $ACLOCAL_DIR" + fi $AUTORECONF $@ fi } diff --git a/packages/devel/libtool/package.mk b/packages/devel/libtool/package.mk index ed295f6649..129b750f19 100644 --- a/packages/devel/libtool/package.mk +++ b/packages/devel/libtool/package.mk @@ -28,6 +28,6 @@ PKG_DEPENDS_TARGET="toolchain" PKG_SECTION="devel" PKG_SHORTDESC="libtool: Generic library support script" PKG_LONGDESC="This is GNU Libtool, a generic library support script. Libtool hides the complexity of using shared libraries behind a consistent, portable interface." -PKG_AUTORECONF="no" +PKG_AUTORECONF="yes" PKG_CONFIGURE_OPTS_HOST="--enable-static --disable-shared" diff --git a/packages/virtual/autotools/package.mk b/packages/virtual/autotools/package.mk index bf7f74c90c..d095ab6bb4 100644 --- a/packages/virtual/autotools/package.mk +++ b/packages/virtual/autotools/package.mk @@ -22,7 +22,7 @@ PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="http://www.openelec.tv" PKG_URL="" -PKG_DEPENDS_HOST="ccache:host autoconf:host automake:host libtool:host intltool:host autoconf-archive:host" +PKG_DEPENDS_HOST="ccache:host autoconf:host automake:host intltool:host libtool:host autoconf-archive:host" PKG_SECTION="virtual" PKG_SHORTDESC="autotools: Metapackage" PKG_LONGDESC="autotools: Metapackage" diff --git a/packages/virtual/toolchain/package.mk b/packages/virtual/toolchain/package.mk index 4bb3981b67..5a83ca1a6c 100644 --- a/packages/virtual/toolchain/package.mk +++ b/packages/virtual/toolchain/package.mk @@ -22,7 +22,7 @@ PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="https://libreelec.tv" PKG_URL="" -PKG_DEPENDS_TARGET="configtools:host make:host xz:host sed:host pkg-config:host autoconf:host automake:host libtool:host intltool:host autoconf-archive:host gcc:host bison:host flex:host cmake:host xmlstarlet:host yasm:host p7zip:host ninja:host" +PKG_DEPENDS_TARGET="configtools:host make:host xz:host sed:host pkg-config:host autoconf:host automake:host intltool:host libtool:host autoconf-archive:host gcc:host bison:host flex:host cmake:host xmlstarlet:host yasm:host p7zip:host ninja:host" PKG_SECTION="virtual" PKG_SHORTDESC="toolchain: LibreELEC.tv' toolchain" PKG_LONGDESC="a crosscompiling toolchain to compile all packages"