Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 30 Jan 2014 00:41:27 +0000 (UTC)
From:      David Thiel <lx@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r341796 - in head/security/nacl: . files
Message-ID:  <201401300041.s0U0fR3N032770@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: lx
Date: Thu Jan 30 00:41:27 2014
New Revision: 341796
URL: http://svnweb.freebsd.org/changeset/ports/341796
QAT: https://qat.redports.org/buildarchive/r341796/

Log:
  Fix build on 10, honor C/CXX, and fix issue with curvecp.
  
  Submitted by:	fallout and Tim Newsham

Added:
  head/security/nacl/files/patch-socket_udp.c   (contents, props changed)
Modified:
  head/security/nacl/Makefile

Modified: head/security/nacl/Makefile
==============================================================================
--- head/security/nacl/Makefile	Wed Jan 29 23:55:29 2014	(r341795)
+++ head/security/nacl/Makefile	Thu Jan 30 00:41:27 2014	(r341796)
@@ -26,6 +26,8 @@ HOSTNAME_CMD?=	/bin/hostname -s
 
 post-patch:
 	@${REINPLACE_CMD} -i -e "s/$$/ -fPIC/" ${WRKSRC}/okcompilers/c
+	@${REINPLACE_CMD} -i -e "s/gcc/${CC}/" ${WRKSRC}/okcompilers/c
+	@${REINPLACE_CMD} -i -e "s/c++/${CXX}/" ${WRKSRC}/okcompilers/cpp
 
 pre-build:
 	${RM} -rf ${WRKSRC}/crypto_onetimeauth/poly1305/amd64

Added: head/security/nacl/files/patch-socket_udp.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/security/nacl/files/patch-socket_udp.c	Thu Jan 30 00:41:27 2014	(r341796)
@@ -0,0 +1,13 @@
+--- curvecp/socket_udp.c.orig	2014-01-29 15:34:07.000000000 -0800
++++ curvecp/socket_udp.c	2014-01-29 15:34:12.000000000 -0800
+@@ -6,6 +6,10 @@
+ #include "socket.h"
+ #include "blocking.h"
+ 
++#ifndef SOL_IP
++#define SOL_IP IPPROTO_IP  /* FreeBSD requires protocol number */
++#endif
++
+ static void enable_bsd_fragmentation(int fd)
+ {
+ #ifdef IP_DONTFRAG



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201401300041.s0U0fR3N032770>