sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 01:39:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

- Revert previous change to add -pthread since libxml2 is not threaded, but is

Browse source 
thread-safe, so -pthread is not needed here, but in threaded programs that
  use libxml2

Pointed out by:	ale@
Discussed with:	marcus, kwm
Pointyhat to:	swills
This commit is contained in:
Steve Wills 2012-09-30 14:31:53 +00:00
parent 2d1e627c68
commit 8c33e8cf1b
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=305080
2 changed files with 1 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
textproc/libxml2/Makefile
View file

@ -13,7 +13,7 @@
PORTNAME= libxml2 PORTNAME= libxml2
PORTVERSION= 2.7.8 PORTVERSION= 2.7.8
PORTREVISION?= 4 PORTREVISION?= 5
CATEGORIES?= textproc gnome CATEGORIES?= textproc gnome
MASTER_SITES= ftp://gd.tuwien.ac.at/pub/libxml/ \ MASTER_SITES= ftp://gd.tuwien.ac.at/pub/libxml/ \
ftp://xmlsoft.org/libxml2/ ftp://xmlsoft.org/libxml2/
@ -54,11 +54,6 @@ CONFIGURE_ARGS+= --without-schemas
.if defined(WITHOUT_THREADS) .if defined(WITHOUT_THREADS)
CONFIGURE_ARGS+= --without-threads CONFIGURE_ARGS+= --without-threads
.else
CPPFLAGS+= ${PTHREAD_CFLAGS}
CFLAGS+= ${PTHREAD_CFLAGS}
LDFLAGS+= ${PTHREAD_LIBS}
EXTRA_PATCHES+= ${FILESDIR}/extra-patch-threads
.endif .endif
.if defined(WITH_MEM_DEBUG) .if defined(WITH_MEM_DEBUG)
@ -74,10 +69,6 @@ CONFIGURE_ARGS+= --with-thread-alloc
.endif .endif
post-patch: 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 .for d in . doc doc/devhelp doc/examples
@${REINPLACE_CMD} -e '/^install-data-am:/ s|install-data-local||' \ @${REINPLACE_CMD} -e '/^install-data-am:/ s|install-data-local||' \
${WRKSRC}/${d}/Makefile.in ${WRKSRC}/${d}/Makefile.in

11
textproc/libxml2/files/extra-patch-threads
View file

@ -1,11 +0,0 @@
--- 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
;;