From: Hongxu Jia <hongxu.jia@windriver.com>
To: Richard Purdie <richard.purdie@linuxfoundation.org>
Cc: saul.wold@intel.com, openembedded-core@lists.openembedded.org
Subject: Re: [PATCH 2/2] socat: fix do_configure/do_compile failed
Date: Tue, 13 May 2014 09:36:59 +0800 [thread overview]
Message-ID: <5371773B.50003@windriver.com> (raw)
In-Reply-To: <1399901751.31891.132.camel@ted>
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 <hongxu.jia@windriver.com>
>> ---
>> .../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 <hongxu.jia@windriver.com>
>> +---
>> + 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 <hongxu.jia@windriver.com>
>> +---
>> + 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 <linux/types.h>])
>> ++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
>>
>
prev parent reply other threads:[~2014-05-13 1:37 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-05-12 11:06 [PATCH 0/2]socat: upgrade to 1.7.2.4 Hongxu Jia
2014-05-12 11:06 ` [PATCH 1/2] socat: " Hongxu Jia
2014-05-12 11:06 ` [PATCH 2/2] socat: fix do_configure/do_compile failed Hongxu Jia
2014-05-12 13:35 ` Richard Purdie
2014-05-13 1:36 ` Hongxu Jia [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=5371773B.50003@windriver.com \
--to=hongxu.jia@windriver.com \
--cc=openembedded-core@lists.openembedded.org \
--cc=richard.purdie@linuxfoundation.org \
--cc=saul.wold@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.