[OE-core] [PATCH 2/2] socat: fix do_configure/do_compile failed

[Richard Purdie]

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.

Cheers,

Richard



> Signed-off-by: Hongxu Jia <hongxu.jia at 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 at 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 at 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
>