Date: Mon, 09 Sep 2013 14:44:57 -0700 (PDT) From: Raphael Kubo da Costa <rakuco@FreeBSD.org> To: FreeBSD-gnats-submit@freebsd.org Cc: fluffy@FreeBSD.org Subject: ports/181974: [PATCH] net/hupnp: Build with clang and libc++. Message-ID: <522e4159.ca4a700a.524a.ffffed72@mx.google.com> Resent-Message-ID: <201309092150.r89Lo0x3038987@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 181974
>Category: ports
>Synopsis: [PATCH] net/hupnp: Build with clang and libc++.
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Mon Sep 09 21:50:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator: Raphael Kubo da Costa
>Release: FreeBSD 10.0-CURRENT amd64
>Organization:
FreeBSD Project
>Environment:
System: FreeBSD orwell 10.0-CURRENT FreeBSD 10.0-CURRENT #3 r255408: Mon Sep 9 00:29:39 EEST 2013 root@orwell:/usr/obj/usr/src/sys/ORWELL amd64
>Description:
The attached patch adds a missing include to the existing files/patch-hmulticast_socket.cpp to make the port build on -CURRENT with clang and libc++. While here, also remove files/patch-herqq.pro and disable building the test apps via QMAKE_ARGS.
>How-To-Repeat:
>Fix:
--- hupnp-libcxx.diff begins here ---
Index: Makefile
===================================================================
--- Makefile (revision 326819)
+++ Makefile (working copy)
@@ -18,7 +18,7 @@
USE_GMAKE= yes
USE_QT4= corelib network xml dbus gui \
qmake_build moc_build rcc_build uic_build
-QMAKE_ARGS= PREFIX=${PREFIX} herqq.pro
+QMAKE_ARGS= PREFIX=${PREFIX} "CONFIG+=DISABLE_AVTESTAPP DISABLE_TESTAPP" herqq.pro
do-configure:
cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${QMAKE} ${QMAKEFLAGS} ${QMAKE_ARGS}
Index: files/patch-herqq.pro
===================================================================
--- files/patch-herqq.pro (revision 326819)
+++ files/patch-herqq.pro (working copy)
@@ -1,7 +0,0 @@
---- ./herqq.pro.orig 2011-03-28 00:42:32.000000000 +1100
-+++ ./herqq.pro 2011-08-08 12:10:55.831627096 +1100
-@@ -18,4 +18,3 @@
- }
-
- !CONFIG(DISABLE_CORE) : SUBDIRS += hupnp
--!CONFIG(DISABLE_TESTAPP) : SUBDIRS += apps/simple_test-app
Index: files/patch-hmulticast_socket.cpp
===================================================================
--- files/patch-hmulticast_socket.cpp (revision 326819)
+++ files/patch-hmulticast_socket.cpp (working copy)
@@ -1,8 +1,10 @@
---- ./hupnp/src/socket/hmulticast_socket.cpp.orig 2011-03-28 00:42:32.000000000 +1100
-+++ ./hupnp/src/socket/hmulticast_socket.cpp 2011-08-08 11:59:59.868629425 +1100
-@@ -27,6 +27,8 @@
+--- ./hupnp/src/socket/hmulticast_socket.cpp.orig 2011-03-28 00:42:32.000000000 +0300
++++ ./hupnp/src/socket/hmulticast_socket.cpp 2013-09-10 00:35:26.000000000 +0300
+@@ -26,7 +26,10 @@
+ #include <winsock2.h>
#include <ws2tcpip.h>
#else
++#include <sys/types.h>
#include <arpa/inet.h>
+#include <netinet/in.h>
+#include <sys/socket.h>
--- hupnp-libcxx.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?522e4159.ca4a700a.524a.ffffed72>