From owner-svn-src-head@freebsd.org Tue Nov 14 05:03:39 2017 Return-Path: Delivered-To: svn-src-head@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 B9235D1F2A0; Tue, 14 Nov 2017 05:03:39 +0000 (UTC) (envelope-from imp@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 84ADF6ECA0; Tue, 14 Nov 2017 05:03:39 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vAE53cvK042459; Tue, 14 Nov 2017 05:03:38 GMT (envelope-from imp@FreeBSD.org) Received: (from imp@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vAE53cvm042457; Tue, 14 Nov 2017 05:03:38 GMT (envelope-from imp@FreeBSD.org) Message-Id: <201711140503.vAE53cvm042457@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: imp set sender to imp@FreeBSD.org using -f From: Warner Losh Date: Tue, 14 Nov 2017 05:03:38 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325792 - in head: contrib/zstd lib/libzstd sys/contrib/zstd usr.bin/zstd X-SVN-Group: head X-SVN-Commit-Author: imp X-SVN-Commit-Paths: in head: contrib/zstd lib/libzstd sys/contrib/zstd usr.bin/zstd X-SVN-Commit-Revision: 325792 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 14 Nov 2017 05:03:39 -0000 Author: imp Date: Tue Nov 14 05:03:38 2017 New Revision: 325792 URL: https://svnweb.freebsd.org/changeset/base/325792 Log: Move zstd from contrib to sys/contrib so it can be used in the kernel. Adjust the Makefiles that referenced it to the new path. Sponsored by: Netflix OK'd by: cem@ and AllanJude@ Added: head/sys/contrib/zstd/ - copied from r325791, head/contrib/zstd/ Deleted: head/contrib/zstd/ Modified: head/lib/libzstd/Makefile head/usr.bin/zstd/Makefile Modified: head/lib/libzstd/Makefile ============================================================================== --- head/lib/libzstd/Makefile Tue Nov 14 03:53:15 2017 (r325791) +++ head/lib/libzstd/Makefile Tue Nov 14 05:03:38 2017 (r325792) @@ -33,7 +33,7 @@ LIBADD= pthread PRIVATELIB= yes -ZSTDDIR= ${SRCTOP}/contrib/zstd +ZSTDDIR= ${SRCTOP}/sys/contrib/zstd .PATH: ${ZSTDDIR}/lib/common ${ZSTDDIR}/lib/compress \ ${ZSTDDIR}/lib/decompress ${ZSTDDIR}/lib/deprecated \ ${ZSTDDIR}/lib/dictBuilder ${ZSTDDIR}/lib Modified: head/usr.bin/zstd/Makefile ============================================================================== --- head/usr.bin/zstd/Makefile Tue Nov 14 03:53:15 2017 (r325791) +++ head/usr.bin/zstd/Makefile Tue Nov 14 05:03:38 2017 (r325792) @@ -7,11 +7,11 @@ SRCS= bench.c \ fileio.c \ zstdcli.c -CFLAGS+= -I${SRCTOP}/contrib/zstd/programs \ - -I${SRCTOP}/contrib/zstd/lib/common \ - -I${SRCTOP}/contrib/zstd/lib/compress \ - -I${SRCTOP}/contrib/zstd/lib/dictBuilder \ - -I${SRCTOP}/contrib/zstd/lib \ +CFLAGS+= -I${SRCTOP}/sys/contrib/zstd/programs \ + -I${SRCTOP}/sys/contrib/zstd/lib/common \ + -I${SRCTOP}/sys/contrib/zstd/lib/compress \ + -I${SRCTOP}/sys/contrib/zstd/lib/dictBuilder \ + -I${SRCTOP}/sys/contrib/zstd/lib \ -DXXH_NAMESPACE=ZSTD_ \ -DHAVE_THREAD=1 \ -DZSTD_MULTITHREAD=1 @@ -25,6 +25,6 @@ MLINKS= zstd.1 unzstd.1 \ WARNS= 2 LIBADD= zstd -.PATH: ${SRCTOP}/contrib/zstd/programs +.PATH: ${SRCTOP}/sys/contrib/zstd/programs .include