From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail1.windriver.com (mail1.windriver.com [147.11.146.13]) by mail.openembedded.org (Postfix) with ESMTP id 9E6967CC87 for ; Wed, 27 Feb 2019 01:56:29 +0000 (UTC) Received: from ALA-HCA.corp.ad.wrs.com ([147.11.189.40]) by mail1.windriver.com (8.15.2/8.15.1) with ESMTPS id x1R1uT3M023391 (version=TLSv1 cipher=AES128-SHA bits=128 verify=FAIL); Tue, 26 Feb 2019 17:56:29 -0800 (PST) Received: from [128.224.162.194] (128.224.162.194) by ALA-HCA.corp.ad.wrs.com (147.11.189.50) with Microsoft SMTP Server (TLS) id 14.3.435.0; Tue, 26 Feb 2019 17:56:29 -0800 To: Khem Raj References: <20190226024522.113503-1-mingli.yu@windriver.com> From: "Yu, Mingli" Message-ID: <5C75EFF3.70005@windriver.com> Date: Wed, 27 Feb 2019 10:03:31 +0800 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.4.0 MIME-Version: 1.0 In-Reply-To: X-Originating-IP: [128.224.162.194] Cc: openembeded-devel Subject: Re: [meta-oe][PATCH] indent: Upgrade to 2.2.12 X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Using the OpenEmbedded metadata to build Distributions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 27 Feb 2019 01:56:30 -0000 Content-Type: text/plain; charset="utf-8"; format=flowed Content-Transfer-Encoding: 8bit On 2019年02月27日 09:36, Khem Raj wrote: > Native version fails to build on ubuntu 14.04 Okay, I will take a look. > > https://errors.yoctoproject.org/Errors/Details/230511/ > > On Mon, Feb 25, 2019 at 6:45 PM wrote: >> >> From: Mingli Yu >> >> Add two patches to fix the build error. >> >> Signed-off-by: Mingli Yu >> --- >> ...01-Makefile.am-remove-regression-dir.patch | 67 +++++++++++++++++++ >> ...ent.c-correct-the-check-for-locale.h.patch | 40 +++++++++++ >> .../{indent_2.2.10.bb => indent_2.2.12.bb} | 9 ++- >> 3 files changed, 113 insertions(+), 3 deletions(-) >> create mode 100644 meta-oe/recipes-extended/indent/indent/0001-Makefile.am-remove-regression-dir.patch >> create mode 100644 meta-oe/recipes-extended/indent/indent/0001-src-indent.c-correct-the-check-for-locale.h.patch >> rename meta-oe/recipes-extended/indent/{indent_2.2.10.bb => indent_2.2.12.bb} (68%) >> >> diff --git a/meta-oe/recipes-extended/indent/indent/0001-Makefile.am-remove-regression-dir.patch b/meta-oe/recipes-extended/indent/indent/0001-Makefile.am-remove-regression-dir.patch >> new file mode 100644 >> index 000000000..357d77d83 >> --- /dev/null >> +++ b/meta-oe/recipes-extended/indent/indent/0001-Makefile.am-remove-regression-dir.patch >> @@ -0,0 +1,67 @@ >> +From 27bda5ee884e79d6d0e76955124d2b0c5798d6cf Mon Sep 17 00:00:00 2001 >> +From: Mingli Yu >> +Date: Mon, 25 Feb 2019 00:34:17 -0800 >> +Subject: [PATCH] Makefile.am: remove regression dir >> + >> +Remove regression dir to fix below do_compile >> +error: >> +| Making all in regression >> +| /bin/sh: line 20: cd: regression: No such file or directory >> +| Makefile:451: recipe for target 'all-recursive' failed >> + >> +BTW, it should be safe not to cover regression dir >> +as there is no Makefile.in under ${S}/regression >> +and the content of ${S}/regression/Makefile as below. >> +------------------------------------- >> +all: >> + >> +install: >> + >> +check: >> + ./TEST >> + >> +distclean: clean >> + >> +maintainer-clean: clean >> + >> +distdir: >> + >> +clean: >> + @rm -rf output >> + >> +.PHONY: all install >> +------------------------------------- >> + >> +Upstream-Status: Pending >> + >> +Signed-off-by: Mingli Yu >> +--- >> + Makefile.am | 5 ++--- >> + 1 file changed, 2 insertions(+), 3 deletions(-) >> + >> +diff --git a/Makefile.am b/Makefile.am >> +index ba37a42..548fea7 100644 >> +--- a/Makefile.am >> ++++ b/Makefile.am >> +@@ -1,7 +1,7 @@ >> + ## Process this file with automake to produce Makefile.in >> + AUTOMAKE_OPTIONS = no-texinfo.tex >> + >> +-SUBDIRS = intl src doc po man regression >> ++SUBDIRS = intl src doc po man >> + >> + BUILT_SOURCES = >> + >> +@@ -13,8 +13,7 @@ EXTRA_DIST = README.md \ >> + aclocal/UTIMBUF.m4 \ >> + miscel/Makefile.mingw32 \ >> + miscel/README.vc++ \ >> +- bootstrap \ >> +- regression >> ++ bootstrap >> + >> + DISTCLEANFILES=config/config.cache config/config.log config.h >> + >> +-- >> +2.17.1 >> + >> diff --git a/meta-oe/recipes-extended/indent/indent/0001-src-indent.c-correct-the-check-for-locale.h.patch b/meta-oe/recipes-extended/indent/indent/0001-src-indent.c-correct-the-check-for-locale.h.patch >> new file mode 100644 >> index 000000000..7df7ecb38 >> --- /dev/null >> +++ b/meta-oe/recipes-extended/indent/indent/0001-src-indent.c-correct-the-check-for-locale.h.patch >> @@ -0,0 +1,40 @@ >> +From 75369ce004ec0f5e46a432fa1dac8cfc7ae1ef8d Mon Sep 17 00:00:00 2001 >> +From: Mingli Yu >> +Date: Sun, 24 Feb 2019 22:35:08 -0800 >> +Subject: [PATCH] src/indent.c: correct the check for locale.h >> + >> +Adjust to check HAVE_LC_MESSAGES or HAVE_LOCALE_H >> +to determine whether include locale.h or not to >> +fix below issue: >> + >> +| ../../indent-2.2.12/src/indent.c: In function 'main': >> +| ../../indent-2.2.12/src/indent.c:1062:5: error: implicit declaration of function 'setlocale'; did you mean 'setstate'? [-Werror=implicit-function-declaration] >> +| setlocale(LC_ALL, ""); >> +| ^~~~~~~~~ >> +| setstate >> +| ../../indent-2.2.12/src/indent.c:1062:5: error: nested extern declaration of 'setlocale' [-Werror=nested-externs] >> +| ../../indent-2.2.12/src/indent.c:1062:15: error: 'LC_ALL' undeclared (first use in this function) >> + >> +Upstream-Status: Pending >> + >> +Signed-off-by: Mingli Yu >> +--- >> + src/indent.c | 2 +- >> + 1 file changed, 1 insertion(+), 1 deletion(-) >> + >> +diff --git a/src/indent.c b/src/indent.c >> +index 4d666e2..0c2780b 100644 >> +--- a/src/indent.c >> ++++ b/src/indent.c >> +@@ -71,7 +71,7 @@ >> + #include >> + #include >> + #include >> +-#ifdef HAVE_LOCALE_H >> ++#if defined(HAVE_LC_MESSAGES) || defined(HAVE_LOCALE_H) >> + #include >> + #endif >> + #include "indent.h" >> +-- >> +2.17.1 >> + >> diff --git a/meta-oe/recipes-extended/indent/indent_2.2.10.bb b/meta-oe/recipes-extended/indent/indent_2.2.12.bb >> similarity index 68% >> rename from meta-oe/recipes-extended/indent/indent_2.2.10.bb >> rename to meta-oe/recipes-extended/indent/indent_2.2.12.bb >> index d25e8e317..eda388e37 100644 >> --- a/meta-oe/recipes-extended/indent/indent_2.2.10.bb >> +++ b/meta-oe/recipes-extended/indent/indent_2.2.12.bb >> @@ -11,9 +11,12 @@ LICENSE = "GPLv3" >> LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" >> DEPENDS = "virtual/gettext" >> >> -SRC_URI = "${GNU_MIRROR}/${BPN}/${BP}.tar.gz" >> -SRC_URI[md5sum] = "be35ea62705733859fbf8caf816d8959" >> -SRC_URI[sha256sum] = "8a9b41be5bfcab5d8c1be74204b10ae78789fc3deabea0775fdced8677292639" >> +SRC_URI = "${GNU_MIRROR}/${BPN}/${BP}.tar.gz \ >> + file://0001-src-indent.c-correct-the-check-for-locale.h.patch \ >> + file://0001-Makefile.am-remove-regression-dir.patch \ >> +" >> +SRC_URI[md5sum] = "4764b6ac98f6654a35da117b8e5e8e14" >> +SRC_URI[sha256sum] = "e77d68c0211515459b8812118d606812e300097cfac0b4e9fb3472664263bb8b" >> >> inherit autotools gettext >> >> -- >> 2.17.1 >> >