Accepting request 258248 from home:javierllorente:branches:openSUSE:Factory:Rings:1-MinimalX
add patch to fix errqueue.h not found OBS-URL: https://build.opensuse.org/request/show/258248 OBS-URL: https://build.opensuse.org/package/show/network:utilities/socat?expand=0&rev=26
This commit is contained in:
Factory Maintainer
Git OBS Bridge
parent
e8726489c9
commit
3d23834a8a
82
fix-linux-errqueue.h-not-found.patch
Normal file
82
fix-linux-errqueue.h-not-found.patch
Normal file
@ -0,0 +1,82 @@
|
|||||||
|
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
|
||||||
|
|
||||||
|
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.
|
||||||
|
|
||||||
|
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
|
||||||
|
|
||||||
|
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
|
||||||
|
+
|
||||||
|
|
||||||
|
|
||||||
@ -1,3 +1,8 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Fri Oct 24 10:02:01 UTC 2014 - javier@opensuse.org
|
||||||
|
|
||||||
|
- Add fix-linux-errqueue.h-not-found.patch
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Tue Mar 11 07:05:34 UTC 2014 - meissner@suse.com
|
Tue Mar 11 07:05:34 UTC 2014 - meissner@suse.com
|
||||||
|
|
||||||
|
|||||||
@ -30,6 +30,7 @@ License: SUSE-GPL-2.0-with-openssl-exception and MIT
|
|||||||
Group: Productivity/Networking/Other
|
Group: Productivity/Networking/Other
|
||||||
Source: http://www.dest-unreach.org/socat/download/%{name}-%{version}.tar.bz2
|
Source: http://www.dest-unreach.org/socat/download/%{name}-%{version}.tar.bz2
|
||||||
Patch1: socat-remove_date.patch
|
Patch1: socat-remove_date.patch
|
||||||
|
Patch2: fix-linux-errqueue.h-not-found.patch
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||||
|
|
||||||
%description
|
%description
|
||||||
@ -43,6 +44,7 @@ combination of two of these.
|
|||||||
%prep
|
%prep
|
||||||
%setup
|
%setup
|
||||||
%patch1 -p1
|
%patch1 -p1
|
||||||
|
%patch2 -p1
|
||||||
|
|
||||||
%build
|
%build
|
||||||
export RPM_OPT_FLAGS="%{optflags} -fno-strict-aliasing"
|
export RPM_OPT_FLAGS="%{optflags} -fno-strict-aliasing"
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user