pool/socat
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 258345 from home:coolo:branches:openSUSE:Factory

Browse Source 
- correctly apply the patch

OBS-URL: https://build.opensuse.org/request/show/258345
OBS-URL: https://build.opensuse.org/package/show/network:utilities/socat?expand=0&rev=27
This commit is contained in:
Factory Maintainer 2014-10-25 06:54:10 +00:00 committed by Git OBS Bridge
parent 3d23834a8a
commit efec79ef14
2 changed files with 57 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

113
fix-linux-errqueue.h-not-found.patch
View File

@ -1,14 +1,4 @@
From patchwork Tue May 27 01:59:03 2014
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: [3/3] socat: fix linux/errqueue.h not found
From: Hongxu Jia <hongxu.jia@windriver.com>
X-Patchwork-Id: 72771
Message-Id: <63ab824a613874b93978ebf17afe2f6d69a58faf.1401155797.git.hongxu.jia@windriver.com>
To: <openembedded-core@lists.openembedded.org>
Cc: saul.wold@intel.com
Date: Tue, 27 May 2014 09:59:03 +0800
configure.in: fix linux/errqueue.h not found
The do_compile failed:
...
@ -25,58 +15,59 @@ For 1.7.2.4, the header check of 'linux/errqueue.h ' was not correctly,
but the old version 1.7.2.3 worked, so we reference 1.7.2.3 to fix this
issue.
Upstream-Status: Pending
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
---
.../socat/fix-linux-errqueue.h-not-found.patch | 40 ++++++++++++++++++++++
meta/recipes-connectivity/socat/socat_1.7.2.4.bb | 1 +
2 files changed, 41 insertions(+)
create mode 100644 meta/recipes-connectivity/socat/socat/fix-linux-errqueue.h-not-found.patch
configure.in | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
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..3823eaf
--- /dev/null
+++ b/meta/recipes-connectivity/socat/socat/fix-linux-errqueue.h-not-found.patch
@@ -0,0 +1,40 @@
+configure.in: fix linux/errqueue.h not found
+
+The do_compile failed:
+...
+|tmp/work/core2-64-poky-linux/socat/1.7.2.4-r0/socat-1.7.2.4/xio-ip.c:
+In function 'xiolog_ancillary_ip':
+|tmp/work/core2-64-poky-linux/socat/1.7.2.4-r0/socat-1.7.2.4/xio-ip.c:520:12:
+error: dereferencing pointer to incomplete type
+| err->ee_errno, '\0', err->ee_origin, '\0', err->ee_type, '\0',
+| ^
+| ake: *** [xio-ip.o] Error 1
+...
+
+For 1.7.2.4, the header check of 'linux/errqueue.h ' was not correctly,
+but the old version 1.7.2.3 worked, so we reference 1.7.2.3 to fix this
+issue.
+
+Upstream-Status: Pending
+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
+
Index: socat-1.7.2.4/configure.in
===================================================================
--- socat-1.7.2.4.orig/configure.in
+++ socat-1.7.2.4/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)
Index: socat-1.7.2.4/configure
===================================================================
--- socat-1.7.2.4.orig/configure
+++ socat-1.7.2.4/configure
@@ -3968,26 +3968,19 @@ fi
done
-for ac_header in linux/types.h
+for ac_header in linux/types.h linux/errqueue.h
do :
- ac_fn_c_check_header_mongrel "$LINENO" "linux/types.h" "ac_cv_header_linux_types_h" "$ac_includes_default"
-if test "x$ac_cv_header_linux_types_h" = xyes; then :
+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
cat >>confdefs.h <<_ACEOF
-#define HAVE_LINUX_TYPES_H 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
fi
done
-ac_fn_c_check_header_compile "$LINENO" "linux/errqueue.h" "ac_cv_header_linux_errqueue_h" "#include <linux/types.h>
-"
-if test "x$ac_cv_header_linux_errqueue_h" = xyes; then :
- $as_echo "#define HAVE_LINUX_ERRQUEUE_H 1" >>confdefs.h
-
-fi
-
-
for ac_header in sys/utsname.h sys/select.h sys/file.h
do :
as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`

5
socat.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Sat Oct 25 06:53:21 UTC 2014 - coolo@suse.com
- correctly apply the patch
-------------------------------------------------------------------
Fri Oct 24 10:02:01 UTC 2014 - javier@opensuse.org