Author: delphij Date: Wed May 8 08:43:15 2019 New Revision: 347244 URL: https://svnweb.freebsd.org/changeset/base/347244
Log: Move contrib/zlib to sys/contrib/zlib so that we can use it in kernel. This is a prerequisite of unifying kernel zlib instances. Submitted by: Yoshihiro Ota <ota at j.email.ne.jp> MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D20191 Added: head/sys/contrib/zlib/ - copied from r347243, head/contrib/zlib/ Deleted: head/contrib/zlib/ Modified: head/lib/libz/FREEBSD-upgrade head/lib/libz/Makefile head/stand/libsa/Makefile head/usr.bin/minigzip/Makefile Modified: head/lib/libz/FREEBSD-upgrade ============================================================================== --- head/lib/libz/FREEBSD-upgrade Wed May 8 05:45:00 2019 (r347243) +++ head/lib/libz/FREEBSD-upgrade Wed May 8 08:43:15 2019 (r347244) @@ -8,7 +8,7 @@ benefit other consumers. To Update: 1) Unpack vendor sources into a clean directory. 2) Import onto the vendor area. - 3) Merge the vendor tree to contrib/zlib, which contains a stripped down + 3) Merge the vendor tree to sys/contrib/zlib, which contains a stripped down version of upstream source, resolve any conflicts. 4) Double check zconf.h, zlib.pc, and Symbol.map to make sure that we have the required changes. Test universe and commit them. Modified: head/lib/libz/Makefile ============================================================================== --- head/lib/libz/Makefile Wed May 8 05:45:00 2019 (r347243) +++ head/lib/libz/Makefile Wed May 8 08:43:15 2019 (r347244) @@ -9,7 +9,7 @@ SHLIB_MAJOR= 6 MAN= zlib.3 zopen.3 MLINKS+= zopen.3 zdopen.3 -ZLIBSRC= ${SRCTOP}/contrib/zlib +ZLIBSRC= ${SRCTOP}/sys/contrib/zlib .PATH: ${ZLIBSRC} Modified: head/stand/libsa/Makefile ============================================================================== --- head/stand/libsa/Makefile Wed May 8 05:45:00 2019 (r347243) +++ head/stand/libsa/Makefile Wed May 8 08:43:15 2019 (r347244) @@ -99,8 +99,8 @@ CFLAGS+= -DBZ_NO_STDIO -DBZ_NO_COMPRESS SRCS+=bzlib.c crctable.c decompress.c huffman.c randtable.c # decompression functionality from zlib -.PATH: ${SRCTOP}/contrib/zlib -CFLAGS+=-DHAVE_MEMCPY -I${SRCTOP}/contrib/zlib +.PATH: ${SRCTOP}/sys/contrib/zlib +CFLAGS+=-DHAVE_MEMCPY -I${SRCTOP}/sys/contrib/zlib SRCS+= adler32.c crc32.c SRCS+= infback.c inffast.c inflate.c inftrees.c zutil.c Modified: head/usr.bin/minigzip/Makefile ============================================================================== --- head/usr.bin/minigzip/Makefile Wed May 8 05:45:00 2019 (r347243) +++ head/usr.bin/minigzip/Makefile Wed May 8 08:43:15 2019 (r347244) @@ -1,6 +1,6 @@ # $FreeBSD$ -SRCDIR= ${SRCTOP}/contrib/zlib/test +SRCDIR= ${SRCTOP}/sys/contrib/zlib/test .PATH: ${SRCDIR} PROG= minigzip _______________________________________________ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
