Date: Wed, 4 Sep 2013 06:12:09 +0000 (UTC) From: Hiroki Sato <hrs@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r326250 - in head/net/packetdrill: . files Message-ID: <201309040612.r846C9ng034571@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: hrs Date: Wed Sep 4 06:12:09 2013 New Revision: 326250 URL: http://svnweb.freebsd.org/changeset/ports/326250 Log: Fix build on 10.0 and 8.X. Reported by: Lars Eggert, pkg-fallout Added: head/net/packetdrill/files/patch-symbols_freebsd.c (contents, props changed) Modified: head/net/packetdrill/Makefile head/net/packetdrill/files/patch-platforms.h Modified: head/net/packetdrill/Makefile ============================================================================== --- head/net/packetdrill/Makefile Wed Sep 4 06:06:59 2013 (r326249) +++ head/net/packetdrill/Makefile Wed Sep 4 06:12:09 2013 (r326250) @@ -22,6 +22,17 @@ OPTIONS_DEFAULT=DOCS EXAMPLES .include <bsd.port.options.mk> +do-configure: + ${PRINTF} "%s\n" "#include <stdio.h>" "int main(void) {" \ + "char *p = fmemopen; char *q = open_memstream; return 0; }" \ + > ${WRKDIR}/configure.c + ${TOUCH} ${WRKSRC}/ports_config.h + cd ${WRKDIR} && \ + if ${CC} -o /dev/null configure.c > /dev/null 2>&1; then \ + ${PRINTF} "%s\n" "#define HAVE_FMEMOPEN 1" \ + "#define HAVE_OPEN_MEMSTREAM 1" > ${WRKSRC}/ports_config.h; \ + fi + pre-build: ${INSTALL_DATA} ${FILESDIR}/Makefile ${FILESDIR}/Makefile.inc ${WRKSRC} .for F in libpd packetdrill checksum_test packet_parser_test packet_to_string_test Modified: head/net/packetdrill/files/patch-platforms.h ============================================================================== --- head/net/packetdrill/files/patch-platforms.h Wed Sep 4 06:06:59 2013 (r326249) +++ head/net/packetdrill/files/patch-platforms.h Wed Sep 4 06:12:09 2013 (r326250) @@ -1,18 +1,18 @@ ---- platforms.h.orig 2013-07-24 19:55:39.000000000 +0900 -+++ platforms.h 2013-07-24 19:56:36.000000000 +0900 -@@ -43,11 +43,15 @@ +--- platforms.h.orig 2013-07-21 04:53:41.000000000 +0900 ++++ platforms.h 2013-09-04 10:34:56.000000000 +0900 +@@ -43,12 +43,14 @@ #if defined(__FreeBSD__) -+#include <sys/param.h> ++#include <paths.h> #define USE_LIBPCAP 1 - #define TUN_PATH "/dev/tun0" +-#define TUN_PATH "/dev/tun0" ++#define TUN_PATH _PATH_DEV "tun0" #define TUN_DEV "tun0" #define HAVE_TCP_INFO 1 -+#if __FreeBSD_version > 1000028 -+#define HAVE_FMEMOPEN 1 -+#endif ++#include "ports_config.h" #include "open_memstream.h" #include "fmemopen.h" + Added: head/net/packetdrill/files/patch-symbols_freebsd.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/packetdrill/files/patch-symbols_freebsd.c Wed Sep 4 06:12:09 2013 (r326250) @@ -0,0 +1,22 @@ +--- symbols_freebsd.c.orig 2013-09-04 15:08:25.000000000 +0900 ++++ symbols_freebsd.c 2013-09-04 15:08:28.000000000 +0900 +@@ -76,7 +76,9 @@ + { SO_LISTENQLEN, "SO_LISTENQLEN" }, + { SO_LISTENINCQLEN, "SO_LISTENINCQLEN" }, + { SO_SETFIB, "SO_SETFIB" }, ++#ifdef SO_USER_COOKIE + { SO_USER_COOKIE, "SO_USER_COOKIE" }, ++#endif + + /* /usr/include/netinet/tcp.h */ + { TCP_NODELAY, "TCP_NODELAY" }, +@@ -296,7 +298,9 @@ + { ENOLINK, "ENOLINK" }, + { EPROTO, "EPROTO" }, + { ENOTCAPABLE, "ENOTCAPABLE" }, ++#ifdef ECAPMODE + { ECAPMODE, "ECAPMODE" }, ++#endif + + }; +
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201309040612.r846C9ng034571>