Date: Tue, 14 Nov 2017 05:03:38 +0000 (UTC) From: Warner Losh <imp@FreeBSD.org> 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 Message-ID: <201711140503.vAE53cvm042457@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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 <bsd.prog.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201711140503.vAE53cvm042457>