From eb8dc40360f0cfef56fb6947cc817a547d6d9bc6 Mon Sep 17 00:00:00 2001 From: Dave Cobbley Date: Tue, 14 Aug 2018 10:05:37 -0700 Subject: [Subtree] Removing import-layers directory As part of the move to subtrees, need to bring all the import layers content to the top level. Change-Id: I4a163d10898cbc6e11c27f776f60e1a470049d8f Signed-off-by: Dave Cobbley Signed-off-by: Brad Bishop --- .../meta/recipes-devtools/m4/m4-1.4.18.inc | 29 ------------------- .../meta/recipes-devtools/m4/m4-native_1.4.18.bb | 14 --------- ...need_charset_alias-when-building-for-musl.patch | 33 ---------------------- .../recipes-devtools/m4/m4/ac_config_links.patch | 31 -------------------- .../meta/recipes-devtools/m4/m4/remove-gets.patch | 24 ---------------- .../meta/recipes-devtools/m4/m4_1.4.18.bb | 3 -- 6 files changed, 134 deletions(-) delete mode 100644 import-layers/yocto-poky/meta/recipes-devtools/m4/m4-1.4.18.inc delete mode 100644 import-layers/yocto-poky/meta/recipes-devtools/m4/m4-native_1.4.18.bb delete mode 100644 import-layers/yocto-poky/meta/recipes-devtools/m4/m4/0001-Unset-need_charset_alias-when-building-for-musl.patch delete mode 100644 import-layers/yocto-poky/meta/recipes-devtools/m4/m4/ac_config_links.patch delete mode 100644 import-layers/yocto-poky/meta/recipes-devtools/m4/m4/remove-gets.patch delete mode 100644 import-layers/yocto-poky/meta/recipes-devtools/m4/m4_1.4.18.bb (limited to 'import-layers/yocto-poky/meta/recipes-devtools/m4') diff --git a/import-layers/yocto-poky/meta/recipes-devtools/m4/m4-1.4.18.inc b/import-layers/yocto-poky/meta/recipes-devtools/m4/m4-1.4.18.inc deleted file mode 100644 index ee8bee446..000000000 --- a/import-layers/yocto-poky/meta/recipes-devtools/m4/m4-1.4.18.inc +++ /dev/null @@ -1,29 +0,0 @@ -SUMMARY = "Traditional Unix macro processor" -HOMEPAGE = "https://www.gnu.org/software/m4/m4.html" -DESCRIPTION = "GNU m4 is an implementation of the traditional Unix macro processor. It is mostly SVR4 \ -compatible although it has some extensions (for example, handling more than 9 positional parameters to macros). \ -GNU M4 also has built-in functions for including files, running shell commands, doing arithmetic, etc." - -inherit autotools texinfo - -SRC_URI = "${GNU_MIRROR}/m4/m4-${PV}.tar.gz \ - file://ac_config_links.patch \ - file://remove-gets.patch \ - " - -SRC_URI_append_class-target = " file://0001-Unset-need_charset_alias-when-building-for-musl.patch" - -SRC_URI[md5sum] = "a077779db287adf4e12a035029002d28" -SRC_URI[sha256sum] = "ab2633921a5cd38e48797bf5521ad259bdc4b979078034a3b790d7fec5493fab" - -LICENSE = "GPLv3" - -LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504\ - file://examples/COPYING;md5=4031593b2166d6c47cae282d944a7ede" - -# Fix "Argument list too long" error when len(TMPDIR) = 410 -acpaths = "-I ./m4" - -EXTRA_OECONF += "--without-libsigsegv-prefix" - -EXTRA_OEMAKE += "'infodir=${infodir}'" diff --git a/import-layers/yocto-poky/meta/recipes-devtools/m4/m4-native_1.4.18.bb b/import-layers/yocto-poky/meta/recipes-devtools/m4/m4-native_1.4.18.bb deleted file mode 100644 index 407ad8933..000000000 --- a/import-layers/yocto-poky/meta/recipes-devtools/m4/m4-native_1.4.18.bb +++ /dev/null @@ -1,14 +0,0 @@ -require m4-${PV}.inc - -inherit native - -INHIBIT_AUTOTOOLS_DEPS = "1" -DEPENDS += "gnu-config-native" - -do_configure() { - install -m 0644 ${STAGING_DATADIR}/gnu-config/config.sub . - install -m 0644 ${STAGING_DATADIR}/gnu-config/config.guess . - oe_runconf -} - -UPSTREAM_CHECK_URI = "${GNU_MIRROR}/m4/" diff --git a/import-layers/yocto-poky/meta/recipes-devtools/m4/m4/0001-Unset-need_charset_alias-when-building-for-musl.patch b/import-layers/yocto-poky/meta/recipes-devtools/m4/m4/0001-Unset-need_charset_alias-when-building-for-musl.patch deleted file mode 100644 index ba1a4bab4..000000000 --- a/import-layers/yocto-poky/meta/recipes-devtools/m4/m4/0001-Unset-need_charset_alias-when-building-for-musl.patch +++ /dev/null @@ -1,33 +0,0 @@ -From b9565dc2fe0c4f7daaec91b7e83bc7313dee2f4a Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Mon, 13 Apr 2015 17:02:13 -0700 -Subject: [PATCH] Unset need_charset_alias when building for musl - -localcharset uses ac_cv_gnu_library_2_1 from glibc21.m4 -which actually shoudl be fixed in gnulib and then all downstream -projects will get it eventually. For now we apply the fix to -coreutils - -Upstream-Status: Pending - -Signed-off-by: Khem Raj ---- - lib/gnulib.mk | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/lib/gnulib.mk b/lib/gnulib.mk -index e1d74db..c0e92dd 100644 ---- a/lib/gnulib.mk -+++ b/lib/gnulib.mk -@@ -1882,7 +1882,7 @@ install-exec-localcharset: all-local - case '$(host_os)' in \ - darwin[56]*) \ - need_charset_alias=true ;; \ -- darwin* | cygwin* | mingw* | pw32* | cegcc*) \ -+ darwin* | cygwin* | mingw* | pw32* | cegcc* | linux-musl*) \ - need_charset_alias=false ;; \ - *) \ - need_charset_alias=true ;; \ --- -2.1.4 - diff --git a/import-layers/yocto-poky/meta/recipes-devtools/m4/m4/ac_config_links.patch b/import-layers/yocto-poky/meta/recipes-devtools/m4/m4/ac_config_links.patch deleted file mode 100644 index 71edf5951..000000000 --- a/import-layers/yocto-poky/meta/recipes-devtools/m4/m4/ac_config_links.patch +++ /dev/null @@ -1,31 +0,0 @@ -Upstream-Status: Inappropriate [configuration] - -This patch fixes a build problem for m4-native experienced on Ubuntu 9.10, -where autoconf/automake (AC_CONFIG_LINKS) ends up making GNUmakefile a -symlink to itself. - -The patch comments out ac_config_links directly in configure, -as autoreconf is not actually run for m4-native. - -I believe it should be safe, as GNUmakefile is actually unpacked from -source, and what we want is to is to not touch it. - -Tested on x86_64_linux (Ubuntu 8.04 and 9.10). - -2009-11-10 Esben Haabendal - -Index: m4-1.4.18/configure -=================================================================== ---- m4-1.4.18.orig/configure -+++ m4-1.4.18/configure -@@ -24415,8 +24415,8 @@ $as_echo "#define GNULIB_TEST_GETTIMEOFD - # only, it does not matter if we skip the link with older autoconf. - # Automake 1.10.1 and earlier try to remove GNUmakefile in non-VPATH - # builds, so use a shell variable to bypass this. -- GNUmakefile=GNUmakefile -- ac_config_links="$ac_config_links $GNUmakefile:$GNUmakefile" -+ # GNUmakefile=GNUmakefile -+ # ac_config_links="$ac_config_links $GNUmakefile:$GNUmakefile" - - - : diff --git a/import-layers/yocto-poky/meta/recipes-devtools/m4/m4/remove-gets.patch b/import-layers/yocto-poky/meta/recipes-devtools/m4/m4/remove-gets.patch deleted file mode 100644 index abe82f3b2..000000000 --- a/import-layers/yocto-poky/meta/recipes-devtools/m4/m4/remove-gets.patch +++ /dev/null @@ -1,24 +0,0 @@ -eglibc has remove gets starting 2.16 -therefore check for its being there before -undefining it. - -Upstream-Status: Pending -Signed-off-by: Khem Raj ---- -diff --git a/lib/stdio.in.h b/lib/stdio.in.h -index 5727452..f04a691 100644 ---- a/lib/stdio.in.h -+++ b/lib/stdio.in.h -@@ -742,10 +742,12 @@ _GL_WARN_ON_USE (getline, "getline is unportable - " - /* It is very rare that the developer ever has full control of stdin, - so any use of gets warrants an unconditional warning; besides, C11 - removed it. */ -+#if defined gets - #undef gets - #if HAVE_RAW_DECL_GETS && !defined __cplusplus - _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead"); - #endif -+#endif - - #if @GNULIB_OBSTACK_PRINTF@ || @GNULIB_OBSTACK_PRINTF_POSIX@ - struct obstack; diff --git a/import-layers/yocto-poky/meta/recipes-devtools/m4/m4_1.4.18.bb b/import-layers/yocto-poky/meta/recipes-devtools/m4/m4_1.4.18.bb deleted file mode 100644 index b12c0adf3..000000000 --- a/import-layers/yocto-poky/meta/recipes-devtools/m4/m4_1.4.18.bb +++ /dev/null @@ -1,3 +0,0 @@ -require m4-${PV}.inc - -BBCLASSEXTEND = "nativesdk" -- cgit v1.2.1