commit: 397ebbd25aa13b7e2e54b247c230d4e7c29acfdf Author: Mike Frysinger <vapier <AT> gentoo <DOT> org> AuthorDate: Wed Dec 16 22:49:26 2015 +0000 Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org> CommitDate: Wed Dec 16 22:52:38 2015 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=397ebbd2
sys-devel/automake: fix version warning w/newer perl sys-devel/automake/automake-1.10.3-r2.ebuild | 83 +++++++++++++++++ sys-devel/automake/automake-1.11.6-r2.ebuild | 91 ++++++++++++++++++ sys-devel/automake/automake-1.12.6-r1.ebuild | 86 +++++++++++++++++ sys-devel/automake/automake-1.13.4-r1.ebuild | 91 ++++++++++++++++++ sys-devel/automake/automake-1.14.1-r1.ebuild | 103 +++++++++++++++++++++ sys-devel/automake/automake-1.15-r1.ebuild | 103 +++++++++++++++++++++ .../automake-1.13-perl-escape-curly-bracket.patch | 37 ++++++++ .../automake-1.15-perl-escape-curly-bracket.patch | 37 ++++++++ 8 files changed, 631 insertions(+) diff --git a/sys-devel/automake/automake-1.10.3-r2.ebuild b/sys-devel/automake/automake-1.10.3-r2.ebuild new file mode 100644 index 0000000..de41a4f --- /dev/null +++ b/sys-devel/automake/automake-1.10.3-r2.ebuild @@ -0,0 +1,83 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="4" + +inherit eutils + +DESCRIPTION="Used to generate Makefile.in from Makefile.am" +HOMEPAGE="https://www.gnu.org/software/automake/"; +SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2" + +LICENSE="GPL-2" +# Use Gentoo versioning for slotting. +SLOT="${PV:0:4}" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd" +IUSE="" + +RDEPEND="dev-lang/perl + >=sys-devel/automake-wrapper-10 + >=sys-devel/autoconf-2.69 + sys-devel/gnuconfig" +DEPEND="${RDEPEND} + sys-apps/help2man" + +src_prepare() { + export WANT_AUTOCONF=2.5 + epatch "${FILESDIR}"/${PN}-1.10-perl-5.16.patch #424453 + epatch "${FILESDIR}"/${PN}-1.13-perl-escape-curly-bracket.patch + chmod a+rx tests/*.test +} + +src_configure() { + econf --docdir=/usr/share/doc/${PF} +} + +# slot the info pages. do this w/out munging the source so we don't have +# to depend on texinfo to regen things. #464146 (among others) +slot_info_pages() { + pushd "${D}"/usr/share/info >/dev/null + rm -f dir + + # Rewrite all the references to other pages. + # before: * aclocal-invocation: (automake)aclocal Invocation. Generating aclocal.m4. + # after: * aclocal-invocation v1.13: (automake-1.13)aclocal Invocation. Generating aclocal.m4. + local p pages=( *.info ) args=() + for p in "${pages[@]/%.info}" ; do + args+=( + -e "/START-INFO-DIR-ENTRY/,/END-INFO-DIR-ENTRY/s|: (${p})| v${SLOT}&|" + -e "s:(${p}):(${p}-${SLOT}):g" + ) + done + sed -i "${args[@]}" * || die + + # Rewrite all the file references, and rename them in the process. + local f d + for f in * ; do + d=${f/.info/-${SLOT}.info} + mv "${f}" "${d}" || die + sed -i -e "s:${f}:${d}:g" * || die + done + + popd >/dev/null +} + +src_install() { + default + slot_info_pages + + # SLOT the docs and junk + local x + for x in aclocal automake ; do + help2man "perl -Ilib ${x}" > ${x}-${SLOT}.1 + doman ${x}-${SLOT}.1 + rm -f "${D}"/usr/bin/${x} + done + + # remove all config.guess and config.sub files replacing them + # w/a symlink to a specific gnuconfig version + for x in guess sub ; do + dosym ../gnuconfig/config.${x} /usr/share/${PN}-${SLOT}/config.${x} + done +} diff --git a/sys-devel/automake/automake-1.11.6-r2.ebuild b/sys-devel/automake/automake-1.11.6-r2.ebuild new file mode 100644 index 0000000..cd44869 --- /dev/null +++ b/sys-devel/automake/automake-1.11.6-r2.ebuild @@ -0,0 +1,91 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="4" + +inherit eutils + +DESCRIPTION="Used to generate Makefile.in from Makefile.am" +HOMEPAGE="https://www.gnu.org/software/automake/"; +SRC_URI="mirror://gnu/${PN}/${P}.tar.xz" + +LICENSE="GPL-2" +# Use Gentoo versioning for slotting. +SLOT="${PV:0:4}" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd" +IUSE="" + +RDEPEND="dev-lang/perl + >=sys-devel/automake-wrapper-10 + >=sys-devel/autoconf-2.69 + sys-devel/gnuconfig" +DEPEND="${RDEPEND} + sys-apps/help2man" + +src_prepare() { + export WANT_AUTOCONF=2.5 + epatch "${FILESDIR}"/${PN}-1.10-perl-5.16.patch #424453 + epatch "${FILESDIR}"/${PN}-1.13-perl-escape-curly-bracket.patch + chmod a+rx tests/*.test +} + +src_configure() { + econf --docdir=/usr/share/doc/${PF} HELP2MAN=true +} + +src_compile() { + emake APIVERSION="${SLOT}" pkgvdatadir="/usr/share/${PN}-${SLOT}" + + local x + for x in aclocal automake; do + help2man "perl -Ilib ${x}" > doc/${x}-${SLOT}.1 + done +} + +# slot the info pages. do this w/out munging the source so we don't have +# to depend on texinfo to regen things. #464146 (among others) +slot_info_pages() { + pushd "${D}"/usr/share/info >/dev/null + rm -f dir + + # Rewrite all the references to other pages. + # before: * aclocal-invocation: (automake)aclocal Invocation. Generating aclocal.m4. + # after: * aclocal-invocation v1.13: (automake-1.13)aclocal Invocation. Generating aclocal.m4. + local p pages=( *.info ) args=() + for p in "${pages[@]/%.info}" ; do + args+=( + -e "/START-INFO-DIR-ENTRY/,/END-INFO-DIR-ENTRY/s|: (${p})| v${SLOT}&|" + -e "s:(${p}):(${p}-${SLOT}):g" + ) + done + sed -i "${args[@]}" * || die + + # Rewrite all the file references, and rename them in the process. + local f d + for f in * ; do + d=${f/.info/-${SLOT}.info} + mv "${f}" "${d}" || die + sed -i -e "s:${f}:${d}:g" * || die + done + + popd >/dev/null +} + +src_install() { + emake DESTDIR="${D}" install \ + APIVERSION="${SLOT}" pkgvdatadir="/usr/share/${PN}-${SLOT}" + slot_info_pages + dodoc NEWS README THANKS TODO AUTHORS ChangeLog + + rm \ + "${D}"/usr/bin/{aclocal,automake} \ + "${D}"/usr/share/man/man1/{aclocal,automake}.1 || die + + # remove all config.guess and config.sub files replacing them + # w/a symlink to a specific gnuconfig version + local x + for x in guess sub ; do + dosym ../gnuconfig/config.${x} /usr/share/${PN}-${SLOT}/config.${x} + done +} diff --git a/sys-devel/automake/automake-1.12.6-r1.ebuild b/sys-devel/automake/automake-1.12.6-r1.ebuild new file mode 100644 index 0000000..70eee07 --- /dev/null +++ b/sys-devel/automake/automake-1.12.6-r1.ebuild @@ -0,0 +1,86 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="4" + +inherit eutils + +DESCRIPTION="Used to generate Makefile.in from Makefile.am" +HOMEPAGE="https://www.gnu.org/software/automake/"; +SRC_URI="mirror://gnu/${PN}/${P}.tar.xz" + +LICENSE="GPL-2" +# Use Gentoo versioning for slotting. +SLOT="${PV:0:4}" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd" +IUSE="" + +RDEPEND="dev-lang/perl + >=sys-devel/automake-wrapper-10 + >=sys-devel/autoconf-2.69 + sys-devel/gnuconfig" +DEPEND="${RDEPEND} + sys-apps/help2man" + +src_prepare() { + export WANT_AUTOCONF=2.5 + epatch "${FILESDIR}"/${PN}-1.13-perl-escape-curly-bracket.patch +} + +src_configure() { + econf --docdir=/usr/share/doc/${PF} HELP2MAN=true +} + +src_compile() { + emake APIVERSION="${SLOT}" pkgvdatadir="/usr/share/${PN}-${SLOT}" +} + +# slot the info pages. do this w/out munging the source so we don't have +# to depend on texinfo to regen things. #464146 (among others) +slot_info_pages() { + pushd "${D}"/usr/share/info >/dev/null + rm -f dir + + # Rewrite all the references to other pages. + # before: * aclocal-invocation: (automake)aclocal Invocation. Generating aclocal.m4. + # after: * aclocal-invocation v1.13: (automake-1.13)aclocal Invocation. Generating aclocal.m4. + local p pages=( *.info ) args=() + for p in "${pages[@]/%.info}" ; do + args+=( + -e "/START-INFO-DIR-ENTRY/,/END-INFO-DIR-ENTRY/s|: (${p})| v${SLOT}&|" + -e "s:(${p}):(${p}-${SLOT}):g" + ) + done + sed -i "${args[@]}" * || die + + # Rewrite all the file references, and rename them in the process. + local f d + for f in * ; do + d=${f/.info/-${SLOT}.info} + mv "${f}" "${d}" || die + sed -i -e "s:${f}:${d}:g" * || die + done + + popd >/dev/null +} + +src_install() { + emake DESTDIR="${D}" install \ + APIVERSION="${SLOT}" pkgvdatadir="/usr/share/${PN}-${SLOT}" + slot_info_pages + rm "${D}"/usr/share/aclocal/README || die + rmdir "${D}"/usr/share/aclocal || die + dodoc AUTHORS ChangeLog NEWS README THANKS + + rm \ + "${D}"/usr/bin/{aclocal,automake} \ + "${D}"/usr/share/man/man1/{aclocal,automake}.1 || die + + # remove all config.guess and config.sub files replacing them + # w/a symlink to a specific gnuconfig version + local x + for x in guess sub ; do + dosym ../gnuconfig/config.${x} /usr/share/${PN}-${SLOT}/config.${x} + done +} diff --git a/sys-devel/automake/automake-1.13.4-r1.ebuild b/sys-devel/automake/automake-1.13.4-r1.ebuild new file mode 100644 index 0000000..8f515d2 --- /dev/null +++ b/sys-devel/automake/automake-1.13.4-r1.ebuild @@ -0,0 +1,91 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="4" + +inherit eutils + +DESCRIPTION="Used to generate Makefile.in from Makefile.am" +HOMEPAGE="https://www.gnu.org/software/automake/"; +SRC_URI="mirror://gnu/${PN}/${P}.tar.xz" + +LICENSE="GPL-2" +# Use Gentoo versioning for slotting. +SLOT="${PV:0:4}" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd" +IUSE="" + +RDEPEND="dev-lang/perl + >=sys-devel/automake-wrapper-10 + >=sys-devel/autoconf-2.69 + sys-devel/gnuconfig" +DEPEND="${RDEPEND} + sys-apps/help2man" + +src_prepare() { + export WANT_AUTOCONF=2.5 + epatch "${FILESDIR}"/${PN}-1.13-dyn-ithreads.patch + epatch "${FILESDIR}"/${PN}-1.13-perl-escape-curly-bracket.patch +} + +src_configure() { + econf --docdir=/usr/share/doc/${PF} HELP2MAN=true +} + +src_compile() { + emake APIVERSION="${SLOT}" pkgvdatadir="/usr/share/${PN}-${SLOT}" +} + +src_test() { + emake check +} + +# slot the info pages. do this w/out munging the source so we don't have +# to depend on texinfo to regen things. #464146 (among others) +slot_info_pages() { + pushd "${D}"/usr/share/info >/dev/null + rm -f dir + + # Rewrite all the references to other pages. + # before: * aclocal-invocation: (automake)aclocal Invocation. Generating aclocal.m4. + # after: * aclocal-invocation v1.13: (automake-1.13)aclocal Invocation. Generating aclocal.m4. + local p pages=( *.info ) args=() + for p in "${pages[@]/%.info}" ; do + args+=( + -e "/START-INFO-DIR-ENTRY/,/END-INFO-DIR-ENTRY/s|: (${p})| v${SLOT}&|" + -e "s:(${p}):(${p}-${SLOT}):g" + ) + done + sed -i "${args[@]}" * || die + + # Rewrite all the file references, and rename them in the process. + local f d + for f in * ; do + d=${f/.info/-${SLOT}.info} + mv "${f}" "${d}" || die + sed -i -e "s:${f}:${d}:g" * || die + done + + popd >/dev/null +} + +src_install() { + emake DESTDIR="${D}" install \ + APIVERSION="${SLOT}" pkgvdatadir="/usr/share/${PN}-${SLOT}" + slot_info_pages + rm "${D}"/usr/share/aclocal/README || die + rmdir "${D}"/usr/share/aclocal || die + dodoc AUTHORS ChangeLog NEWS README THANKS + + rm \ + "${D}"/usr/bin/{aclocal,automake} \ + "${D}"/usr/share/man/man1/{aclocal,automake}.1 || die + + # remove all config.guess and config.sub files replacing them + # w/a symlink to a specific gnuconfig version + local x + for x in guess sub ; do + dosym ../gnuconfig/config.${x} /usr/share/${PN}-${SLOT}/config.${x} + done +} diff --git a/sys-devel/automake/automake-1.14.1-r1.ebuild b/sys-devel/automake/automake-1.14.1-r1.ebuild new file mode 100644 index 0000000..add59cb --- /dev/null +++ b/sys-devel/automake/automake-1.14.1-r1.ebuild @@ -0,0 +1,103 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="4" + +inherit eutils versionator + +if [[ ${PV/_beta} == ${PV} ]]; then + MY_P=${P} + SRC_URI="mirror://gnu/${PN}/${P}.tar.xz + ftp://alpha.gnu.org/pub/gnu/${PN}/${MY_P}.tar.xz"; +else + MY_PV="$(get_major_version).$(($(get_version_component_range 2)-1))b" + MY_P="${PN}-${MY_PV}" + + # Alpha/beta releases are not distributed on the usual mirrors. + SRC_URI="ftp://alpha.gnu.org/pub/gnu/${PN}/${MY_P}.tar.xz"; +fi + +DESCRIPTION="Used to generate Makefile.in from Makefile.am" +HOMEPAGE="https://www.gnu.org/software/automake/"; + +LICENSE="GPL-2" +# Use Gentoo versioning for slotting. +SLOT="${PV:0:4}" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd" +IUSE="" + +RDEPEND="dev-lang/perl + >=sys-devel/automake-wrapper-10 + >=sys-devel/autoconf-2.69 + sys-devel/gnuconfig" +DEPEND="${RDEPEND} + sys-apps/help2man" + +S="${WORKDIR}/${MY_P}" + +src_prepare() { + export WANT_AUTOCONF=2.5 + epatch "${FILESDIR}"/${PN}-1.15-perl-escape-curly-bracket.patch +} + +src_configure() { + econf --docdir=/usr/share/doc/${PF} HELP2MAN=true +} + +src_compile() { + emake APIVERSION="${SLOT}" pkgvdatadir="/usr/share/${PN}-${SLOT}" +} + +src_test() { + emake check +} + +# slot the info pages. do this w/out munging the source so we don't have +# to depend on texinfo to regen things. #464146 (among others) +slot_info_pages() { + pushd "${D}"/usr/share/info >/dev/null + rm -f dir + + # Rewrite all the references to other pages. + # before: * aclocal-invocation: (automake)aclocal Invocation. Generating aclocal.m4. + # after: * aclocal-invocation v1.13: (automake-1.13)aclocal Invocation. Generating aclocal.m4. + local p pages=( *.info ) args=() + for p in "${pages[@]/%.info}" ; do + args+=( + -e "/START-INFO-DIR-ENTRY/,/END-INFO-DIR-ENTRY/s|: (${p})| v${SLOT}&|" + -e "s:(${p}):(${p}-${SLOT}):g" + ) + done + sed -i "${args[@]}" * || die + + # Rewrite all the file references, and rename them in the process. + local f d + for f in * ; do + d=${f/.info/-${SLOT}.info} + mv "${f}" "${d}" || die + sed -i -e "s:${f}:${d}:g" * || die + done + + popd >/dev/null +} + +src_install() { + emake DESTDIR="${D}" install \ + APIVERSION="${SLOT}" pkgvdatadir="/usr/share/${PN}-${SLOT}" + slot_info_pages + rm "${D}"/usr/share/aclocal/README || die + rmdir "${D}"/usr/share/aclocal || die + dodoc AUTHORS ChangeLog NEWS README THANKS + + rm \ + "${D}"/usr/bin/{aclocal,automake} \ + "${D}"/usr/share/man/man1/{aclocal,automake}.1 || die + + # remove all config.guess and config.sub files replacing them + # w/a symlink to a specific gnuconfig version + local x + for x in guess sub ; do + dosym ../gnuconfig/config.${x} /usr/share/${PN}-${SLOT}/config.${x} + done +} diff --git a/sys-devel/automake/automake-1.15-r1.ebuild b/sys-devel/automake/automake-1.15-r1.ebuild new file mode 100644 index 0000000..add59cb --- /dev/null +++ b/sys-devel/automake/automake-1.15-r1.ebuild @@ -0,0 +1,103 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="4" + +inherit eutils versionator + +if [[ ${PV/_beta} == ${PV} ]]; then + MY_P=${P} + SRC_URI="mirror://gnu/${PN}/${P}.tar.xz + ftp://alpha.gnu.org/pub/gnu/${PN}/${MY_P}.tar.xz"; +else + MY_PV="$(get_major_version).$(($(get_version_component_range 2)-1))b" + MY_P="${PN}-${MY_PV}" + + # Alpha/beta releases are not distributed on the usual mirrors. + SRC_URI="ftp://alpha.gnu.org/pub/gnu/${PN}/${MY_P}.tar.xz"; +fi + +DESCRIPTION="Used to generate Makefile.in from Makefile.am" +HOMEPAGE="https://www.gnu.org/software/automake/"; + +LICENSE="GPL-2" +# Use Gentoo versioning for slotting. +SLOT="${PV:0:4}" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd" +IUSE="" + +RDEPEND="dev-lang/perl + >=sys-devel/automake-wrapper-10 + >=sys-devel/autoconf-2.69 + sys-devel/gnuconfig" +DEPEND="${RDEPEND} + sys-apps/help2man" + +S="${WORKDIR}/${MY_P}" + +src_prepare() { + export WANT_AUTOCONF=2.5 + epatch "${FILESDIR}"/${PN}-1.15-perl-escape-curly-bracket.patch +} + +src_configure() { + econf --docdir=/usr/share/doc/${PF} HELP2MAN=true +} + +src_compile() { + emake APIVERSION="${SLOT}" pkgvdatadir="/usr/share/${PN}-${SLOT}" +} + +src_test() { + emake check +} + +# slot the info pages. do this w/out munging the source so we don't have +# to depend on texinfo to regen things. #464146 (among others) +slot_info_pages() { + pushd "${D}"/usr/share/info >/dev/null + rm -f dir + + # Rewrite all the references to other pages. + # before: * aclocal-invocation: (automake)aclocal Invocation. Generating aclocal.m4. + # after: * aclocal-invocation v1.13: (automake-1.13)aclocal Invocation. Generating aclocal.m4. + local p pages=( *.info ) args=() + for p in "${pages[@]/%.info}" ; do + args+=( + -e "/START-INFO-DIR-ENTRY/,/END-INFO-DIR-ENTRY/s|: (${p})| v${SLOT}&|" + -e "s:(${p}):(${p}-${SLOT}):g" + ) + done + sed -i "${args[@]}" * || die + + # Rewrite all the file references, and rename them in the process. + local f d + for f in * ; do + d=${f/.info/-${SLOT}.info} + mv "${f}" "${d}" || die + sed -i -e "s:${f}:${d}:g" * || die + done + + popd >/dev/null +} + +src_install() { + emake DESTDIR="${D}" install \ + APIVERSION="${SLOT}" pkgvdatadir="/usr/share/${PN}-${SLOT}" + slot_info_pages + rm "${D}"/usr/share/aclocal/README || die + rmdir "${D}"/usr/share/aclocal || die + dodoc AUTHORS ChangeLog NEWS README THANKS + + rm \ + "${D}"/usr/bin/{aclocal,automake} \ + "${D}"/usr/share/man/man1/{aclocal,automake}.1 || die + + # remove all config.guess and config.sub files replacing them + # w/a symlink to a specific gnuconfig version + local x + for x in guess sub ; do + dosym ../gnuconfig/config.${x} /usr/share/${PN}-${SLOT}/config.${x} + done +} diff --git a/sys-devel/automake/files/automake-1.13-perl-escape-curly-bracket.patch b/sys-devel/automake/files/automake-1.13-perl-escape-curly-bracket.patch new file mode 100644 index 0000000..a113d09 --- /dev/null +++ b/sys-devel/automake/files/automake-1.13-perl-escape-curly-bracket.patch @@ -0,0 +1,37 @@ +http://debbugs.gnu.org/cgi/bugreport.cgi?bug=21001 + +From 34163794a58b5bd91c5d6bd9adf5437571c7a479 Mon Sep 17 00:00:00 2001 +From: Pavel Raiskup <prais...@redhat.com> +Date: Tue, 7 Jul 2015 10:54:24 +0200 +Subject: [PATCH] bin/automake: escape '{' in regexp pattern + +Based on perlre(1) documentation: +.. in Perl v5.26, literal uses of a curly bracket will be required +to be escaped, say by preceding them with a backslash ("\{" ) or +enclosing them within square brackets ("[{]") .. + +References: +https://bugzilla.redhat.com/1239379 + +* bin/automake.in (substitute_ac_subst_variables): Escape the +occurrence of '{' character. +--- + bin/automake.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/bin/automake.in b/bin/automake.in +index 0c29184..c294ced 100644 +--- a/bin/automake.in ++++ b/bin/automake.in +@@ -3898,7 +3898,7 @@ sub substitute_ac_subst_variables_worker + sub substitute_ac_subst_variables ($) + { + my ($text) = @_; +- $text =~ s/\${([^ \t=:+{}]+)}/&substitute_ac_subst_variables_worker ($1)/ge; ++ $text =~ s/\$\{([^ \t=:+{}]+)}/&substitute_ac_subst_variables_worker ($1)/ge; + return $text; + } + +-- +2.1.0 + diff --git a/sys-devel/automake/files/automake-1.15-perl-escape-curly-bracket.patch b/sys-devel/automake/files/automake-1.15-perl-escape-curly-bracket.patch new file mode 100644 index 0000000..268548d --- /dev/null +++ b/sys-devel/automake/files/automake-1.15-perl-escape-curly-bracket.patch @@ -0,0 +1,37 @@ +http://debbugs.gnu.org/cgi/bugreport.cgi?bug=21001 + +From 34163794a58b5bd91c5d6bd9adf5437571c7a479 Mon Sep 17 00:00:00 2001 +From: Pavel Raiskup <prais...@redhat.com> +Date: Tue, 7 Jul 2015 10:54:24 +0200 +Subject: [PATCH] bin/automake: escape '{' in regexp pattern + +Based on perlre(1) documentation: +.. in Perl v5.26, literal uses of a curly bracket will be required +to be escaped, say by preceding them with a backslash ("\{" ) or +enclosing them within square brackets ("[{]") .. + +References: +https://bugzilla.redhat.com/1239379 + +* bin/automake.in (substitute_ac_subst_variables): Escape the +occurrence of '{' character. +--- + bin/automake.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/bin/automake.in b/bin/automake.in +index 0c29184..c294ced 100644 +--- a/bin/automake.in ++++ b/bin/automake.in +@@ -3898,7 +3898,7 @@ sub substitute_ac_subst_variables_worker + sub substitute_ac_subst_variables + { + my ($text) = @_; +- $text =~ s/\${([^ \t=:+{}]+)}/substitute_ac_subst_variables_worker ($1)/ge; ++ $text =~ s/\$\{([^ \t=:+{}]+)}/substitute_ac_subst_variables_worker ($1)/ge; + return $text; + } + +-- +2.1.0 +
