From f627fa2992420c09e57376fbba62d545512c19f2 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Thu, 3 Sep 2020 15:39:24 +0100 Subject: autoconf: consolidate SRC_URI There's no point splitting SRC_URI between the .inc and the .bb when there's just one recipe and the splitting appeared to be arbitrary. Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/recipes-devtools/autoconf/autoconf.inc | 5 ----- meta/recipes-devtools/autoconf/autoconf_2.69.bb | 25 ++++++++++++++----------- 2 files changed, 14 insertions(+), 16 deletions(-) diff --git a/meta/recipes-devtools/autoconf/autoconf.inc b/meta/recipes-devtools/autoconf/autoconf.inc index 2c87bf8296..fa28d2c9a3 100644 --- a/meta/recipes-devtools/autoconf/autoconf.inc +++ b/meta/recipes-devtools/autoconf/autoconf.inc @@ -62,11 +62,6 @@ RDEPENDS_${PN}_class-nativesdk = "\ nativesdk-perl-module-threads \ " - - -SRC_URI = "${GNU_MIRROR}/autoconf/autoconf-${PV}.tar.gz \ - file://program_prefix.patch" - inherit autotools texinfo PERL = "${USRBINPATH}/perl" diff --git a/meta/recipes-devtools/autoconf/autoconf_2.69.bb b/meta/recipes-devtools/autoconf/autoconf_2.69.bb index 8e67f4b829..2e1b9bdc90 100644 --- a/meta/recipes-devtools/autoconf/autoconf_2.69.bb +++ b/meta/recipes-devtools/autoconf/autoconf_2.69.bb @@ -5,17 +5,20 @@ PR = "r11" LICENSE = "GPLv2 & GPLv3" LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \ file://COPYINGv3;md5=d32239bcb673463ab874e80d47fae504" -SRC_URI += "file://check-automake-cross-warning.patch \ - file://autoreconf-exclude.patch \ - file://autoreconf-gnuconfigize.patch \ - file://config_site.patch \ - file://remove-usr-local-lib-from-m4.patch \ - file://preferbash.patch \ - file://autotest-automake-result-format.patch \ - file://add_musl_config.patch \ - file://performance.patch \ - file://AC_HEADER_MAJOR-port-to-glibc-2.25.patch \ - file://autoconf-replace-w-option-in-shebangs-with-modern-use-warnings.patch \ + +SRC_URI = "${GNU_MIRROR}/autoconf/autoconf-${PV}.tar.gz \ + file://program_prefix.patch \ + file://check-automake-cross-warning.patch \ + file://autoreconf-exclude.patch \ + file://autoreconf-gnuconfigize.patch \ + file://config_site.patch \ + file://remove-usr-local-lib-from-m4.patch \ + file://preferbash.patch \ + file://autotest-automake-result-format.patch \ + file://add_musl_config.patch \ + file://performance.patch \ + file://AC_HEADER_MAJOR-port-to-glibc-2.25.patch \ + file://autoconf-replace-w-option-in-shebangs-with-modern-use-warnings.patch \ " SRC_URI[md5sum] = "82d05e03b93e45f5a39b828dc9c6c29b" -- cgit 1.2.3-korg