pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

libwebsockets: Backport upstream patch to build tests



Module Name:	pkgsrc-wip
Committed By:	Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By:	kamil
Date:		Sat Feb 27 03:42:50 2016 +0100
Changeset:	94b14b3a1a8482f017d2939210c1cfc8f4b23b7d

Modified Files:
	libwebsockets/Makefile
	libwebsockets/distinfo
Added Files:
	libwebsockets/patches/patch-lib_libwebsockets.h
	libwebsockets/patches/patch-test-server_fuzxy.c

Log Message:
libwebsockets: Backport upstream patch to build tests

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=94b14b3a1a8482f017d2939210c1cfc8f4b23b7d

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 libwebsockets/Makefile                          |  3 ---
 libwebsockets/distinfo                          |  2 ++
 libwebsockets/patches/patch-lib_libwebsockets.h | 15 +++++++++++++++
 libwebsockets/patches/patch-test-server_fuzxy.c | 19 +++++++++++++++++++
 4 files changed, 36 insertions(+), 3 deletions(-)

diffs:
diff --git a/libwebsockets/Makefile b/libwebsockets/Makefile
index 86ee623..d2eaeda 100644
--- a/libwebsockets/Makefile
+++ b/libwebsockets/Makefile
@@ -14,8 +14,5 @@ LICENSE=	gnu-lgpl-v2.1
 USE_CMAKE=	yes
 USE_LANGUAGES=	c c++
 
-# Build without tests (with them it doesn't build for now)
-CMAKE_ARGS+=	-DLWS_WITHOUT_TESTAPPS=ON
-
 .include "../../security/openssl/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/libwebsockets/distinfo b/libwebsockets/distinfo
index a835001..d4b48be 100644
--- a/libwebsockets/distinfo
+++ b/libwebsockets/distinfo
@@ -4,3 +4,5 @@ SHA1 (libwebsockets-1.7.2.tar.gz) = aa5df5138ffd1568cd07c22c5e7c84e8458c71d3
 RMD160 (libwebsockets-1.7.2.tar.gz) = 16e89ed29c78c3be14adf99b410592717cb82a3d
 SHA512 (libwebsockets-1.7.2.tar.gz) = 4293b06d5586e1742c247697402a92359a3851caad3bb945644c3ab35399e11a1772249ac7ceaa7da9c5d00e5c2d1b723021300a3057aeeb7747dfe05b3e8630
 Size (libwebsockets-1.7.2.tar.gz) = 2908161 bytes
+SHA1 (patch-lib_libwebsockets.h) = cdde2a026a7ff891753c66d61eba97bc9e699a25
+SHA1 (patch-test-server_fuzxy.c) = 04a280a19f6246624b3c7647b4ed598f282ff932
diff --git a/libwebsockets/patches/patch-lib_libwebsockets.h b/libwebsockets/patches/patch-lib_libwebsockets.h
new file mode 100644
index 0000000..e530ccb
--- /dev/null
+++ b/libwebsockets/patches/patch-lib_libwebsockets.h
@@ -0,0 +1,15 @@
+$NetBSD$
+
+--- lib/libwebsockets.h.orig	2016-02-25 02:11:01.000000000 +0000
++++ lib/libwebsockets.h
+@@ -140,6 +140,10 @@ struct sockaddr_in;
+ #else /* NOT WIN32 */
+ #include <unistd.h>
+ 
++#if defined(__NetBSD__)
++#include <netinet/in.h>
++#endif
++
+ #define LWS_INLINE inline
+ #define LWS_O_RDONLY O_RDONLY
+ 
diff --git a/libwebsockets/patches/patch-test-server_fuzxy.c b/libwebsockets/patches/patch-test-server_fuzxy.c
new file mode 100644
index 0000000..b01f7f6
--- /dev/null
+++ b/libwebsockets/patches/patch-test-server_fuzxy.c
@@ -0,0 +1,19 @@
+$NetBSD$
+
+--- test-server/fuzxy.c.orig	2016-02-25 02:11:01.000000000 +0000
++++ test-server/fuzxy.c
+@@ -61,6 +61,9 @@
+ #include <unistd.h>
+ #include <sys/socket.h>
+ #endif
++#ifdefined(__NetBSD__)
++#include <netinet/in.h>
++#endif
+ 
+ #define MAX_FUZZ_BUF (1024 * 1024)
+ 
+@@ -953,4 +956,3 @@ bail1:
+ 
+ 	return 0;
+ }
+-


Home | Main Index | Thread Index | Old Index