svn commit: r317879 - in head: lib/libzstd share/mk usr.bin/zstd

[Baptiste Daroussin]

Author: bapt
Date: Sat May  6 10:59:10 2017
New Revision: 317879
URL: https://svnweb.freebsd.org/changeset/base/317879

Log:
  Build zstandard with threading enabled

Modified:
  head/lib/libzstd/Makefile
  head/share/mk/src.libnames.mk
  head/usr.bin/zstd/Makefile

Modified: head/lib/libzstd/Makefile
==============================================================================
--- head/lib/libzstd/Makefile	Sat May  6 10:28:57 2017	(r317878)
+++ head/lib/libzstd/Makefile	Sat May  6 10:59:10 2017	(r317879)
@@ -22,7 +22,9 @@ SRCS=	entropy_common.c \
 	zdict.c
 WARNS=	2
 INCS=	zstd.h
-CFLAGS+=	-I${ZSTDDIR}/lib -I${ZSTDDIR}/lib/common -DXXH_NAMESPACE=ZSTD_
+CFLAGS+=	-I${ZSTDDIR}/lib -I${ZSTDDIR}/lib/common -DXXH_NAMESPACE=ZSTD_ \
+		-DZSTD_MULTITHREAD=1
+LIBADD=	pthread
 
 PRIVATELIB=	yes
 

Modified: head/share/mk/src.libnames.mk
==============================================================================
--- head/share/mk/src.libnames.mk	Sat May  6 10:28:57 2017	(r317878)
+++ head/share/mk/src.libnames.mk	Sat May  6 10:59:10 2017	(r317879)
@@ -209,6 +209,7 @@ _LIBRARIES+= \
 # 2nd+ order consumers.  Auto-generating this would be better.
 _DP_80211=	sbuf bsdxml
 _DP_archive=	z bz2 lzma bsdxml
+_DP_zstd=	pthread
 .if ${MK_BLACKLIST} != "no"
 _DP_blacklist+=	pthread
 .endif

Modified: head/usr.bin/zstd/Makefile
==============================================================================
--- head/usr.bin/zstd/Makefile	Sat May  6 10:28:57 2017	(r317878)
+++ head/usr.bin/zstd/Makefile	Sat May  6 10:59:10 2017	(r317879)
@@ -13,7 +13,8 @@ CFLAGS+=	-I${SRCTOP}/contrib/zstd/progra
 		-I${SRCTOP}/contrib/zstd/lib/dictBuilder \
 		-I${SRCTOP}/contrib/zstd/lib \
 		-DXXH_NAMESPACE=ZSTD_ \
-		-DHAVE_THREAD=1
+		-DHAVE_THREAD=1 \
+		-DZSTD_MULTITHREAD=1
 SCRIPTS=	zstdgrep
 LINKS=	${BINDIR}/zstd ${BINDIR}/unzstd \
 	${BINDIR}/zstd ${BINDIR}/zstdcat \