From 192f635fa6964213e771c0b1443b2c15863b3d57 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Thu, 4 Feb 2021 15:52:20 +0000 Subject: [PATCH] autoconf: merge .bb and .inc files These files are split for historical reasons, so merge them to make maintaining them easier. The bb and inc had differing LICENSE assignments. Current autoconf is GPLv3+. Signed-off-by: Ross Burton --- meta/recipes-devtools/autoconf/autoconf.inc | 55 ------------------ .../autoconf/autoconf_2.69.bb | 57 ++++++++++++++++++- 2 files changed, 55 insertions(+), 57 deletions(-) delete mode 100644 meta/recipes-devtools/autoconf/autoconf.inc diff --git a/meta/recipes-devtools/autoconf/autoconf.inc b/meta/recipes-devtools/autoconf/autoconf.inc deleted file mode 100644 index a4db7ca38f..0000000000 --- a/meta/recipes-devtools/autoconf/autoconf.inc +++ /dev/null @@ -1,55 +0,0 @@ -SUMMARY = "A GNU tool that produce shell scripts to automatically configure software" -DESCRIPTION = "Autoconf is an extensible package of M4 macros that produce shell scripts to automatically \ -configure software source code packages. Autoconf creates a configuration script for a package from a template \ -file that lists the operating system features that the package can use, in the form of M4 macro calls." -LICENSE = "GPLv3" -HOMEPAGE = "http://www.gnu.org/software/autoconf/" -SECTION = "devel" -DEPENDS = "m4-native gnu-config-native" - -RDEPENDS_${PN} = "m4 gnu-config \ - perl \ - perl-module-bytes \ - perl-module-carp \ - perl-module-constant \ - perl-module-data-dumper \ - perl-module-errno \ - perl-module-exporter \ - perl-module-file-basename \ - perl-module-file-compare \ - perl-module-file-copy \ - perl-module-file-find \ - perl-module-file-glob \ - perl-module-file-path \ - perl-module-file-spec \ - perl-module-file-spec-unix \ - perl-module-file-stat \ - perl-module-getopt-long \ - perl-module-io-file \ - perl-module-overloading \ - perl-module-posix \ - perl-module-symbol \ - perl-module-thread-queue \ - perl-module-threads \ - " -RDEPENDS_${PN}_class-native = "m4-native gnu-config-native hostperl-runtime-native" - -inherit autotools texinfo - -PERL = "${USRBINPATH}/perl" -PERL_class-native = "/usr/bin/env perl" -PERL_class-nativesdk = "/usr/bin/env perl" - -CACHED_CONFIGUREVARS += "ac_cv_path_PERL='${PERL}'" - -do_configure() { - # manually install a newer config.guess/.sub - install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.guess ${S}/build-aux - install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.sub ${S}/build-aux - - oe_runconf -} - -do_install_append() { - rm -rf ${D}${datadir}/emacs -} diff --git a/meta/recipes-devtools/autoconf/autoconf_2.69.bb b/meta/recipes-devtools/autoconf/autoconf_2.69.bb index 2e1b9bdc90..e30536a221 100644 --- a/meta/recipes-devtools/autoconf/autoconf_2.69.bb +++ b/meta/recipes-devtools/autoconf/autoconf_2.69.bb @@ -1,8 +1,14 @@ -require autoconf.inc +SUMMARY = "A GNU tool that produce shell scripts to automatically configure software" +DESCRIPTION = "Autoconf is an extensible package of M4 macros that produce shell scripts to automatically \ +configure software source code packages. Autoconf creates a configuration script for a package from a template \ +file that lists the operating system features that the package can use, in the form of M4 macro calls." +LICENSE = "GPLv3+" +HOMEPAGE = "http://www.gnu.org/software/autoconf/" +SECTION = "devel" +DEPENDS = "m4-native gnu-config-native" PR = "r11" -LICENSE = "GPLv2 & GPLv3" LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \ file://COPYINGv3;md5=d32239bcb673463ab874e80d47fae504" @@ -26,6 +32,53 @@ SRC_URI[sha256sum] = "954bd69b391edc12d6a4a51a2dd1476543da5c6bbf05a95b59dc0dd6fd SRC_URI_append_class-native = " file://fix_path_xtra.patch" +RDEPENDS_${PN} = "m4 gnu-config \ + perl \ + perl-module-bytes \ + perl-module-carp \ + perl-module-constant \ + perl-module-data-dumper \ + perl-module-errno \ + perl-module-exporter \ + perl-module-file-basename \ + perl-module-file-compare \ + perl-module-file-copy \ + perl-module-file-find \ + perl-module-file-glob \ + perl-module-file-path \ + perl-module-file-spec \ + perl-module-file-spec-unix \ + perl-module-file-stat \ + perl-module-getopt-long \ + perl-module-io-file \ + perl-module-overloading \ + perl-module-posix \ + perl-module-symbol \ + perl-module-thread-queue \ + perl-module-threads \ + " +RDEPENDS_${PN}_class-native = "m4-native gnu-config-native hostperl-runtime-native" + +inherit autotools texinfo + +PERL = "${USRBINPATH}/perl" +PERL_class-native = "/usr/bin/env perl" +PERL_class-nativesdk = "/usr/bin/env perl" + +CACHED_CONFIGUREVARS += "ac_cv_path_PERL='${PERL}'" + EXTRA_OECONF += "ac_cv_path_M4=m4 ac_cv_prog_TEST_EMACS=no" +do_configure() { + # manually install a newer config.guess/.sub + install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.guess ${S}/build-aux + install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.sub ${S}/build-aux + + oe_runconf +} + +do_install_append() { + rm -rf ${D}${datadir}/emacs +} + BBCLASSEXTEND = "native nativesdk" -- 2.40.1