Date: Tue, 25 Sep 2012 14:55:49 +0000 (UTC) From: Steve Wills <swills@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r304839 - in head/textproc/libxml2: . files Message-ID: <201209251455.q8PEtn61048033@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: swills Date: Tue Sep 25 14:55:49 2012 New Revision: 304839 URL: http://svn.freebsd.org/changeset/ports/304839 Log: - Build with -pthread and include -pthread in xml2-config --libs output when threads are enabled PR: ports/171353 Discussed with: marcus, kwm Approved by: marcus Added: head/textproc/libxml2/files/extra-patch-threads (contents, props changed) Modified: head/textproc/libxml2/Makefile (contents, props changed) Modified: head/textproc/libxml2/Makefile ============================================================================== --- head/textproc/libxml2/Makefile Tue Sep 25 14:47:21 2012 (r304838) +++ head/textproc/libxml2/Makefile Tue Sep 25 14:55:49 2012 (r304839) @@ -13,7 +13,7 @@ PORTNAME= libxml2 PORTVERSION= 2.7.8 -PORTREVISION?= 3 +PORTREVISION?= 4 CATEGORIES?= textproc gnome MASTER_SITES= ftp://gd.tuwien.ac.at/pub/libxml/ \ ftp://xmlsoft.org/libxml2/ @@ -54,6 +54,11 @@ CONFIGURE_ARGS+= --without-schemas .if defined(WITHOUT_THREADS) CONFIGURE_ARGS+= --without-threads +.else +CPPFLAGS+= ${PTHREAD_CFLAGS} +CFLAGS+= ${PTHREAD_CFLAGS} +LDFLAGS+= ${PTHREAD_LIBS} +EXTRA_PATCHES+= ${FILESDIR}/extra-patch-threads .endif .if defined(WITH_MEM_DEBUG) @@ -69,6 +74,10 @@ CONFIGURE_ARGS+= --with-thread-alloc .endif post-patch: +.if !defined(WITHOUT_THREADS) + @${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|' \ + ${WRKSRC}/xml2-config.in +.endif .for d in . doc doc/devhelp doc/examples @${REINPLACE_CMD} -e '/^install-data-am:/ s|install-data-local||' \ ${WRKSRC}/${d}/Makefile.in Added: head/textproc/libxml2/files/extra-patch-threads ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/textproc/libxml2/files/extra-patch-threads Tue Sep 25 14:55:49 2012 (r304839) @@ -0,0 +1,11 @@ +--- xml2-config.in.orig 2012-09-08 17:23:54.000000000 +0000 ++++ xml2-config.in 2012-09-08 17:26:22.000000000 +0000 +@@ -91,7 +91,7 @@ + echo @XML_LIBDIR@ @XML_LIBS@ + fi + else +- echo @XML_LIBDIR@ @XML_LIBS@ @WIN32_EXTRA_LIBADD@ ++ echo @XML_LIBDIR@ @XML_LIBS@ @WIN32_EXTRA_LIBADD@ %%PTHREAD_LIBS%% + fi + ;; +
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201209251455.q8PEtn61048033>