From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.windriver.com (unknown [147.11.1.11]) by mail.openembedded.org (Postfix) with ESMTP id 5BEF565EA8 for ; Tue, 13 May 2014 01:37:14 +0000 (UTC) Received: from ALA-HCB.corp.ad.wrs.com (ala-hcb.corp.ad.wrs.com [147.11.189.41]) by mail.windriver.com (8.14.5/8.14.5) with ESMTP id s4D1bCf8020971 (version=TLSv1/SSLv3 cipher=AES128-SHA bits=128 verify=FAIL); Mon, 12 May 2014 18:37:12 -0700 (PDT) Received: from [128.224.162.194] (128.224.162.194) by ALA-HCB.corp.ad.wrs.com (147.11.189.41) with Microsoft SMTP Server id 14.3.169.1; Mon, 12 May 2014 18:37:11 -0700 Message-ID: <5371773B.50003@windriver.com> Date: Tue, 13 May 2014 09:36:59 +0800 From: Hongxu Jia User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:24.0) Gecko/20100101 Thunderbird/24.2.0 MIME-Version: 1.0 To: Richard Purdie References: <6b5bf7d0a382dc4f9af759c5c7072a411c2bdda5.1399892554.git.hongxu.jia@windriver.com> <1399901751.31891.132.camel@ted> In-Reply-To: <1399901751.31891.132.camel@ted> Cc: saul.wold@intel.com, openembedded-core@lists.openembedded.org Subject: Re: [PATCH 2/2] socat: fix do_configure/do_compile failed X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 13 May 2014 01:37:17 -0000 Content-Type: text/plain; charset="UTF-8"; format=flowed Content-Transfer-Encoding: 7bit On 05/12/2014 09:35 PM, Richard Purdie wrote: > On Mon, 2014-05-12 at 19:06 +0800, Hongxu Jia wrote: >> We reference 1.7.2.3 to fix the do_configure/do_compile failures in 1.7.2.4 > I'm afraid these descriptions don't help much. What was the problem that > was encountered? How does a change from 1.7.2.3 fix it? Why are these > fixes "oe specific"? They don't look embedded specific? > > More explanation is needed for these patches. Got it, V2 incoming. //Hongxu > Cheers, > > Richard > > > >> Signed-off-by: Hongxu Jia >> --- >> .../socat/socat/fix-cross-compiling-failed.patch | 25 ++++++++++++++++++++ >> .../socat/fix-linux-errqueue.h-not-found.patch | 27 ++++++++++++++++++++++ >> meta/recipes-connectivity/socat/socat_1.7.2.4.bb | 2 ++ >> 3 files changed, 54 insertions(+) >> create mode 100644 meta/recipes-connectivity/socat/socat/fix-cross-compiling-failed.patch >> create mode 100644 meta/recipes-connectivity/socat/socat/fix-linux-errqueue.h-not-found.patch >> >> diff --git a/meta/recipes-connectivity/socat/socat/fix-cross-compiling-failed.patch b/meta/recipes-connectivity/socat/socat/fix-cross-compiling-failed.patch >> new file mode 100644 >> index 0000000..6b9658b >> --- /dev/null >> +++ b/meta/recipes-connectivity/socat/socat/fix-cross-compiling-failed.patch >> @@ -0,0 +1,25 @@ >> +configure.in: fix cross compiling failed >> + >> +The confugring failed in 1.7.2.4, we reference 1.7.2.3 to fix this issue. >> + >> +Upstream-Status: Inappropriate [oe specific] >> +Signed-off-by: Hongxu Jia >> +--- >> + configure.in | 2 +- >> + 1 file changed, 1 insertion(+), 1 deletion(-) >> + >> +diff --git a/configure.in b/configure.in >> +--- a/configure.in >> ++++ b/configure.in >> +@@ -41,7 +41,7 @@ AC_CHECK_PROG(AR, ar, ar, gar) >> + # fail >> + AC_LANG_COMPILER_REQUIRE() >> + >> +-if test "$CC" = "gcc"; then >> ++if test "$GCC" = yes; then >> + CFLAGS="$CFLAGS -D_GNU_SOURCE -Wall -Wno-parentheses" >> + ERRONWARN="-Werror -O0" >> + elif test "$CC" = "clang"; then >> +-- >> +1.8.1.2 >> + >> diff --git a/meta/recipes-connectivity/socat/socat/fix-linux-errqueue.h-not-found.patch b/meta/recipes-connectivity/socat/socat/fix-linux-errqueue.h-not-found.patch >> new file mode 100644 >> index 0000000..1de7aae >> --- /dev/null >> +++ b/meta/recipes-connectivity/socat/socat/fix-linux-errqueue.h-not-found.patch >> @@ -0,0 +1,27 @@ >> +configure.in: fix linux/errqueue.h not found >> + >> +The compiling failed in 1.7.2.4, we reference 1.7.2.3 to fix this issue. >> + >> +Upstream-Status: Inappropriate [oe specific] >> +Signed-off-by: Hongxu Jia >> +--- >> + configure.in | 3 +-- >> + 1 file changed, 1 insertion(+), 2 deletions(-) >> + >> +diff --git a/configure.in b/configure.in >> +index 70922f9..bdfbe98 100644 >> +--- a/configure.in >> ++++ b/configure.in >> +@@ -79,8 +79,7 @@ AC_HEADER_RESOLV() >> + >> + AC_CHECK_HEADERS(termios.h linux/if_tun.h) >> + AC_CHECK_HEADERS(net/if_dl.h) >> +-AC_CHECK_HEADERS(linux/types.h) >> +-AC_CHECK_HEADER(linux/errqueue.h, AC_DEFINE(HAVE_LINUX_ERRQUEUE_H), [], [#include ]) >> ++AC_CHECK_HEADERS(linux/types.h linux/errqueue.h) >> + AC_CHECK_HEADERS(sys/utsname.h sys/select.h sys/file.h) >> + AC_CHECK_HEADERS(util.h bsd/libutil.h libutil.h sys/stropts.h regex.h) >> + AC_CHECK_HEADERS(linux/fs.h linux/ext2_fs.h) >> +-- >> +1.8.1.2 >> + >> diff --git a/meta/recipes-connectivity/socat/socat_1.7.2.4.bb b/meta/recipes-connectivity/socat/socat_1.7.2.4.bb >> index 6c3aba1..777125f 100644 >> --- a/meta/recipes-connectivity/socat/socat_1.7.2.4.bb >> +++ b/meta/recipes-connectivity/socat/socat_1.7.2.4.bb >> @@ -15,6 +15,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ >> SRC_URI = "http://www.dest-unreach.org/socat/download/socat-${PV}.tar.bz2 \ >> file://compile.patch \ >> file://fix-xxx_SHIFT-autoheader.patch \ >> + file://fix-cross-compiling-failed.patch \ >> + file://fix-linux-errqueue.h-not-found.patch \ >> " >> >> >> -- >> 1.8.1.2 >> >