From owner-svn-src-all@freebsd.org  Sat May  6 10:59:12 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 3AF89D5EEAA;
 Sat,  6 May 2017 10:59:12 +0000 (UTC)
 (envelope-from bapt@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 074421B2C;
 Sat,  6 May 2017 10:59:11 +0000 (UTC)
 (envelope-from bapt@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v46AxBOl002087;
 Sat, 6 May 2017 10:59:11 GMT (envelope-from bapt@FreeBSD.org)
Received: (from bapt@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v46AxAMw002082;
 Sat, 6 May 2017 10:59:10 GMT (envelope-from bapt@FreeBSD.org)
Message-Id: <201705061059.v46AxAMw002082@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: bapt set sender to
 bapt@FreeBSD.org using -f
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Sat, 6 May 2017 10:59:10 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r317879 - in head: lib/libzstd share/mk usr.bin/zstd
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 06 May 2017 10:59:12 -0000

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 \