From 7cad5628a081776b97e6afab488c2ab8d97ebb0c Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Sun, 31 May 2020 17:52:36 +0200 Subject: automake: 1.16.1 -> 1.16.2 (From OE-Core rev: 70db6675aabdda6465912a1c1f7a2a7391201517) Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- ...tion-in-shebangs-with-modern-use-warnings.patch | 18 ++++----- meta/recipes-devtools/automake/automake_1.16.1.bb | 44 ---------------------- meta/recipes-devtools/automake/automake_1.16.2.bb | 44 ++++++++++++++++++++++ 3 files changed, 53 insertions(+), 53 deletions(-) delete mode 100644 meta/recipes-devtools/automake/automake_1.16.1.bb create mode 100644 meta/recipes-devtools/automake/automake_1.16.2.bb diff --git a/meta/recipes-devtools/automake/automake/automake-replace-w-option-in-shebangs-with-modern-use-warnings.patch b/meta/recipes-devtools/automake/automake/automake-replace-w-option-in-shebangs-with-modern-use-warnings.patch index 1592c02cb9..0e84c4bf86 100644 --- a/meta/recipes-devtools/automake/automake/automake-replace-w-option-in-shebangs-with-modern-use-warnings.patch +++ b/meta/recipes-devtools/automake/automake/automake-replace-w-option-in-shebangs-with-modern-use-warnings.patch @@ -1,4 +1,4 @@ -From 081385f4d4bba367afad3bff1fa034f5263305e6 Mon Sep 17 00:00:00 2001 +From 857c843d4bcf576467b505eb05a47f3e7d32caaa Mon Sep 17 00:00:00 2001 From: Serhii Popovych Date: Wed, 10 Feb 2016 17:07:32 +0000 Subject: [PATCH] perl: Replace -w option in shebangs with modern "use @@ -23,16 +23,16 @@ Signed-off-by: Robert Yang 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/bin/aclocal.in b/bin/aclocal.in -index b3715d9..461d453 100644 +index 9a20325..bd185d4 100644 --- a/bin/aclocal.in +++ b/bin/aclocal.in @@ -1,4 +1,4 @@ -#!@PERL@ -w +#!@PERL@ - # -*- perl -*- + # aclocal - create aclocal.m4 by scanning configure.ac -*- perl -*- # @configure_input@ - -@@ -32,6 +32,7 @@ BEGIN + # Copyright (C) 1996-2020 Free Software Foundation, Inc. +@@ -26,6 +26,7 @@ BEGIN } use strict; @@ -41,16 +41,16 @@ index b3715d9..461d453 100644 use Automake::Config; use Automake::General; diff --git a/bin/automake.in b/bin/automake.in -index 8377d20..3a66965 100644 +index 5ed404a..d387b8e 100644 --- a/bin/automake.in +++ b/bin/automake.in @@ -1,4 +1,4 @@ -#!@PERL@ -w +#!@PERL@ - # -*- perl -*- + # automake - create Makefile.in from Makefile.am -*- perl -*- # @configure_input@ - -@@ -28,6 +28,7 @@ eval 'case $# in 0) exec @PERL@ -S "$0";; *) exec @PERL@ -S "$0" "$@";; esac' + # Copyright (C) 1994-2020 Free Software Foundation, Inc. +@@ -23,6 +23,7 @@ package Automake; use strict; diff --git a/meta/recipes-devtools/automake/automake_1.16.1.bb b/meta/recipes-devtools/automake/automake_1.16.1.bb deleted file mode 100644 index d82eed3c60..0000000000 --- a/meta/recipes-devtools/automake/automake_1.16.1.bb +++ /dev/null @@ -1,44 +0,0 @@ -require automake.inc -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" -DEPENDS_class-native = "autoconf-native" - -NAMEVER = "${@oe.utils.trim_version("${PV}", 2)}" - -RDEPENDS_${PN} += "\ - autoconf \ - perl \ - perl-module-bytes \ - perl-module-data-dumper \ - perl-module-strict \ - perl-module-text-parsewords \ - perl-module-thread-queue \ - perl-module-threads \ - perl-module-vars " - -RDEPENDS_${PN}_class-native = "autoconf-native hostperl-runtime-native" -RDEPENDS_${PN}_class-nativesdk = "nativesdk-autoconf" - -SRC_URI += "file://python-libdir.patch \ - file://buildtest.patch \ - file://performance.patch \ - file://new_rt_path_for_test-driver.patch \ - file://automake-replace-w-option-in-shebangs-with-modern-use-warnings.patch \ - file://0001-automake-Add-default-libtool_tag-to-cppasm.patch \ - file://0001-build-fix-race-in-parallel-builds.patch \ - " - -SRC_URI[md5sum] = "83cc2463a4080efd46a72ba2c9f6b8f5" -SRC_URI[sha256sum] = "608a97523f97db32f1f5d5615c98ca69326ced2054c9f82e65bade7fc4c9dea8" - -PERL = "${USRBINPATH}/perl" -PERL_class-native = "${USRBINPATH}/env perl" -PERL_class-nativesdk = "${USRBINPATH}/env perl" - -CACHED_CONFIGUREVARS += "ac_cv_path_PERL='${PERL}'" - -do_install_append () { - install -d ${D}${datadir} -} - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta/recipes-devtools/automake/automake_1.16.2.bb b/meta/recipes-devtools/automake/automake_1.16.2.bb new file mode 100644 index 0000000000..fd8ed0ed3b --- /dev/null +++ b/meta/recipes-devtools/automake/automake_1.16.2.bb @@ -0,0 +1,44 @@ +require automake.inc +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" +DEPENDS_class-native = "autoconf-native" + +NAMEVER = "${@oe.utils.trim_version("${PV}", 2)}" + +RDEPENDS_${PN} += "\ + autoconf \ + perl \ + perl-module-bytes \ + perl-module-data-dumper \ + perl-module-strict \ + perl-module-text-parsewords \ + perl-module-thread-queue \ + perl-module-threads \ + perl-module-vars " + +RDEPENDS_${PN}_class-native = "autoconf-native hostperl-runtime-native" +RDEPENDS_${PN}_class-nativesdk = "nativesdk-autoconf" + +SRC_URI += "file://python-libdir.patch \ + file://buildtest.patch \ + file://performance.patch \ + file://new_rt_path_for_test-driver.patch \ + file://automake-replace-w-option-in-shebangs-with-modern-use-warnings.patch \ + file://0001-automake-Add-default-libtool_tag-to-cppasm.patch \ + file://0001-build-fix-race-in-parallel-builds.patch \ + " + +SRC_URI[md5sum] = "f1a14f2ab2b0fb861a011e1d94e589e0" +SRC_URI[sha256sum] = "b2f361094b410b4acbf4efba7337bdb786335ca09eb2518635a09fb7319ca5c1" + +PERL = "${USRBINPATH}/perl" +PERL_class-native = "${USRBINPATH}/env perl" +PERL_class-nativesdk = "${USRBINPATH}/env perl" + +CACHED_CONFIGUREVARS += "ac_cv_path_PERL='${PERL}'" + +do_install_append () { + install -d ${D}${datadir} +} + +BBCLASSEXTEND = "native nativesdk" -- cgit v1.2.3-54-g00ecf