Author: delphij
Date: Thu May 23 05:49:43 2019
New Revision: 348149
URL: https://svnweb.freebsd.org/changeset/base/348149
Log:
MFC r347244:
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>
Added:
- copied from r347244, head/sys/contrib/zlib/
Directory Properties:
stable/12/sys/contrib/zlib/ (props changed)
Deleted:
stable/12/contrib/zlib/
Modified:
stable/12/lib/libz/FREEBSD-upgrade
stable/12/lib/libz/Makefile
stable/12/stand/libsa/Makefile
stable/12/usr.bin/minigzip/Makefile
Directory Properties:
stable/12/ (props changed)
Modified: stable/12/lib/libz/FREEBSD-upgrade
==============================================================================
--- stable/12/lib/libz/FREEBSD-upgrade Thu May 23 05:17:18 2019
(r348148)
+++ stable/12/lib/libz/FREEBSD-upgrade Thu May 23 05:49:43 2019
(r348149)
@@ -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: stable/12/lib/libz/Makefile
==============================================================================
--- stable/12/lib/libz/Makefile Thu May 23 05:17:18 2019 (r348148)
+++ stable/12/lib/libz/Makefile Thu May 23 05:49:43 2019 (r348149)
@@ -8,7 +8,7 @@ SHLIBDIR?= /lib
SHLIB_MAJOR= 6
MAN= zlib.3 zopen.3
-ZLIBSRC= ${SRCTOP}/contrib/zlib
+ZLIBSRC= ${SRCTOP}/sys/contrib/zlib
.PATH: ${ZLIBSRC}
Modified: stable/12/stand/libsa/Makefile
==============================================================================
--- stable/12/stand/libsa/Makefile Thu May 23 05:17:18 2019
(r348148)
+++ stable/12/stand/libsa/Makefile Thu May 23 05:49:43 2019
(r348149)
@@ -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: stable/12/usr.bin/minigzip/Makefile
==============================================================================
--- stable/12/usr.bin/minigzip/Makefile Thu May 23 05:17:18 2019
(r348148)
+++ stable/12/usr.bin/minigzip/Makefile Thu May 23 05:49:43 2019
(r348149)
@@ -1,6 +1,6 @@
# $FreeBSD$
-SRCDIR= ${SRCTOP}/contrib/zlib/test
+SRCDIR= ${SRCTOP}/sys/contrib/zlib/test
.PATH: ${SRCDIR}
PROG= minigzip
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
