Date: Mon, 3 Jun 2013 02:51:22 +0900 From: KATO Tsuguru <tkato432@yahoo.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/179217: net-im/libjingle: Fix build with clang Message-ID: <20130603025122.67f3d3e11941a3cdc021860d@yahoo.com> Resent-Message-ID: <201306021810.r52IA3J6099485@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 179217
>Category: ports
>Synopsis: net-im/libjingle: Fix build with clang
>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: Sun Jun 02 18:10:03 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator: KATO Tsuguru
>Release: FreeBSD 8.4-RELEASE i386
>Organization:
>Environment:
>Description:
- Fix build with clang
- Add LICENSE
>How-To-Repeat:
>Fix:
diff -urN /usr/ports/net-im/libjingle/Makefile net-im/libjingle/Makefile
--- /usr/ports/net-im/libjingle/Makefile 2013-04-24 01:02:10.000000000 +0900
+++ net-im/libjingle/Makefile 2013-06-03 00:00:00.000000000 +0900
@@ -10,6 +10,9 @@
MAINTAINER= ports@FreeBSD.org
COMMENT= Google Talk's implementation of Jingle and Jingle-Audio
+LICENSE= BSD
+LICENSE_FILE= ${WRKSRC}/COPYING
+
LIB_DEPENDS= speex:${PORTSDIR}/audio/speex \
ilbc:${PORTSDIR}/net/ilbc \
ortp:${PORTSDIR}/net/linphone-base \
@@ -19,26 +22,25 @@
clusterit-[0-9]* pcp-[0-9]* synce-librapi2-[0-9]*
USES= pkgconfig
+USE_DOS2UNIX= README
USE_GNOME= glib20
USE_OPENSSL= yes
-USE_AUTOTOOLS= libtool
-USE_DOS2UNIX= README
USE_GMAKE= yes
-GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --with-ilbc=${LOCALBASE} \
- --with-speex=${LOCALBASE}
-CONFIGURE_ENV= PKG_CONFIG="${PKG_CONFIG}" \
- EXPAT_CFLAGS="-I${LOCALBASE}/include" \
+USE_AUTOTOOLS= libtool
+CONFIGURE_ENV= EXPAT_CFLAGS="-I${LOCALBASE}/include" \
EXPAT_LIBS="-L${LOCALBASE}/lib -lexpat" \
- GLIB_CFLAGS="$$(${PKG_CONFIG} --cflags glib-2.0)" \
- GLIB_LIBS="$$(${PKG_CONFIG} --libs glib-2.0)" \
+ GLIB_CFLAGS="$$(pkg-config --cflags glib-2.0)" \
+ GLIB_LIBS="$$(pkg-config --libs glib-2.0)" \
ILBC_CFLAGS="-I${LOCALBASE}/include/ilbc" \
ILBC_LIBS="-L${LOCALBASE}/lib -lilbc" \
- SPEEX_CFLAGS="$$(${PKG_CONFIG} --cflags speex)" \
- SPEEX_LIBS="$$(${PKG_CONFIG} --libs speex)"
-CPPFLAGS+= -I${LOCALBASE}/include -I${OPENSSLINC} ${PTHREAD_CFLAGS} -g
+ SPEEX_CFLAGS="$$(pkg-config --cflags speex)" \
+ SPEEX_LIBS="$$(pkg-config --libs speex)"
+CONFIGURE_ARGS= --with-ilbc=${LOCALBASE} \
+ --with-speex=${LOCALBASE}
MAKE_JOBS_SAFE= yes
-LDFLAGS+=-L${LOCALBASE}/lib -L${OPENSSLLIB} ${PTHREAD_LIBS}
+
+CPPFLAGS+= -I${OPENSSLINC} -I${LOCALBASE}/include -g
+LDFLAGS+= -L${OPENSSLLIB} -L${LOCALBASE}/lib -pthread
PORTDOCS= AUTHORS \
ChangeLog \
@@ -72,6 +74,12 @@
'#define ${feature} 1' >> \
${CONFIGURE_WRKSRC}/config.h
.endfor
+ @${REINPLACE_CMD} -e \
+ '/^int main/s|char\* argv|char** argv|' \
+ ${WRKSRC}/talk/base/virtualsocket_unittest.cc
+ @${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
+ 's|`pkg-config --cflags gtk+-2.0`|| ; \
+ s|-lpthread|-pthread|'
post-install:
.if ${PORT_OPTIONS:MDOCS}
diff -urN /usr/ports/net-im/libjingle/files/patch-talk__base__stringutils.h net-im/libjingle/files/patch-talk__base__stringutils.h
--- /usr/ports/net-im/libjingle/files/patch-talk__base__stringutils.h 2012-11-08 06:33:18.000000000 +0900
+++ net-im/libjingle/files/patch-talk__base__stringutils.h 2013-06-03 00:00:00.000000000 +0900
@@ -1,5 +1,37 @@
--- talk/base/stringutils.h.orig 2008-09-06 23:10:21.000000000 -0300
+++ talk/base/stringutils.h 2008-09-06 23:13:17.000000000 -0300
+@@ -197,15 +197,6 @@
+ }
+
+ template<class CTYPE>
+-size_t sprintfn(CTYPE* buffer, size_t buflen, const CTYPE* format, ...) {
+- va_list args;
+- va_start(args, format);
+- size_t len = vsprintfn(buffer, buflen, format, args);
+- va_end(args);
+- return len;
+-}
+-
+-template<class CTYPE>
+ size_t vsprintfn(CTYPE* buffer, size_t buflen, const CTYPE* format,
+ va_list args) {
+ int len = vsnprintf(buffer, buflen, format, args);
+@@ -216,6 +207,15 @@
+ return len;
+ }
+
++template<class CTYPE>
++size_t sprintfn(CTYPE* buffer, size_t buflen, const CTYPE* format, ...) {
++ va_list args;
++ va_start(args, format);
++ size_t len = vsprintfn(buffer, buflen, format, args);
++ va_end(args);
++ return len;
++}
++
+ ///////////////////////////////////////////////////////////////////////////////
+ // Allow safe comparing and copying ascii (not UTF-8) with both wide and
+ // non-wide character strings.
@@ -269,7 +269,7 @@
template<>
struct Traits<char> {
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20130603025122.67f3d3e11941a3cdc021860d>