From d87a41d2dc611259989cb1252c34d0c6ef802971 Mon Sep 17 00:00:00 2001 From: Robert Yang Date: Thu, 9 Feb 2017 19:23:15 -0800 Subject: m4: 1.4.17 -> 1.4.18 Rebased remove-gets.patch. Signed-off-by: Robert Yang Signed-off-by: Ross Burton --- meta/recipes-devtools/m4/m4-1.4.17.inc | 18 ------------------ meta/recipes-devtools/m4/m4-1.4.18.inc | 19 +++++++++++++++++++ meta/recipes-devtools/m4/m4-native_1.4.17.bb | 13 ------------- meta/recipes-devtools/m4/m4-native_1.4.18.bb | 13 +++++++++++++ meta/recipes-devtools/m4/m4/remove-gets.patch | 15 ++++++++------- meta/recipes-devtools/m4/m4_1.4.17.bb | 3 --- meta/recipes-devtools/m4/m4_1.4.18.bb | 3 +++ 7 files changed, 43 insertions(+), 41 deletions(-) delete mode 100644 meta/recipes-devtools/m4/m4-1.4.17.inc create mode 100644 meta/recipes-devtools/m4/m4-1.4.18.inc delete mode 100644 meta/recipes-devtools/m4/m4-native_1.4.17.bb create mode 100644 meta/recipes-devtools/m4/m4-native_1.4.18.bb delete mode 100644 meta/recipes-devtools/m4/m4_1.4.17.bb create mode 100644 meta/recipes-devtools/m4/m4_1.4.18.bb (limited to 'meta') diff --git a/meta/recipes-devtools/m4/m4-1.4.17.inc b/meta/recipes-devtools/m4/m4-1.4.17.inc deleted file mode 100644 index 8ea4e04907..0000000000 --- a/meta/recipes-devtools/m4/m4-1.4.17.inc +++ /dev/null @@ -1,18 +0,0 @@ -require m4.inc - -EXTRA_OECONF += "--without-libsigsegv-prefix" - -LICENSE = "GPLv3" - -LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504\ - file://examples/COPYING;md5=4031593b2166d6c47cae282d944a7ede" - -SRC_URI += "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] = "a5e9954b1dae036762f7b13673a2cf76" -SRC_URI[sha256sum] = "3ce725133ee552b8b4baca7837fb772940b25e81b2a9dc92537aeaf733538c9e" diff --git a/meta/recipes-devtools/m4/m4-1.4.18.inc b/meta/recipes-devtools/m4/m4-1.4.18.inc new file mode 100644 index 0000000000..5652b74308 --- /dev/null +++ b/meta/recipes-devtools/m4/m4-1.4.18.inc @@ -0,0 +1,19 @@ +require m4.inc + +EXTRA_OECONF += "--without-libsigsegv-prefix" + +LICENSE = "GPLv3" + +LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504\ + file://examples/COPYING;md5=4031593b2166d6c47cae282d944a7ede" + +SRC_URI += "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" diff --git a/meta/recipes-devtools/m4/m4-native_1.4.17.bb b/meta/recipes-devtools/m4/m4-native_1.4.17.bb deleted file mode 100644 index 06d8aa244e..0000000000 --- a/meta/recipes-devtools/m4/m4-native_1.4.17.bb +++ /dev/null @@ -1,13 +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 -} - diff --git a/meta/recipes-devtools/m4/m4-native_1.4.18.bb b/meta/recipes-devtools/m4/m4-native_1.4.18.bb new file mode 100644 index 0000000000..06d8aa244e --- /dev/null +++ b/meta/recipes-devtools/m4/m4-native_1.4.18.bb @@ -0,0 +1,13 @@ +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 +} + diff --git a/meta/recipes-devtools/m4/m4/remove-gets.patch b/meta/recipes-devtools/m4/m4/remove-gets.patch index effb353f11..abe82f3b2d 100644 --- a/meta/recipes-devtools/m4/m4/remove-gets.patch +++ b/meta/recipes-devtools/m4/m4/remove-gets.patch @@ -4,20 +4,21 @@ undefining it. Upstream-Status: Pending Signed-off-by: Khem Raj -Index: m4-1.4.17/lib/stdio.in.h -=================================================================== ---- m4-1.4.17.orig/lib/stdio.in.h 2013-10-16 14:41:01.678496227 +0300 -+++ m4-1.4.17/lib/stdio.in.h 2013-10-16 14:41:48.849427839 +0300 -@@ -717,10 +717,12 @@ +--- +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 + #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/meta/recipes-devtools/m4/m4_1.4.17.bb b/meta/recipes-devtools/m4/m4_1.4.17.bb deleted file mode 100644 index b12c0adf3a..0000000000 --- a/meta/recipes-devtools/m4/m4_1.4.17.bb +++ /dev/null @@ -1,3 +0,0 @@ -require m4-${PV}.inc - -BBCLASSEXTEND = "nativesdk" diff --git a/meta/recipes-devtools/m4/m4_1.4.18.bb b/meta/recipes-devtools/m4/m4_1.4.18.bb new file mode 100644 index 0000000000..b12c0adf3a --- /dev/null +++ b/meta/recipes-devtools/m4/m4_1.4.18.bb @@ -0,0 +1,3 @@ +require m4-${PV}.inc + +BBCLASSEXTEND = "nativesdk" -- cgit 1.2.3-korg