svn commit: r348261 - in stable/11: contrib/zlib lib/libz stand/libsa usr.bin/minigzip

[Yoshihiro Ota]

Hi Xin,

I didn't think we would have time for this to hit 11.3 release.

Next important one is the crc32 one.
Unless we do this split, we will need a special aid to work-around zlib/zlib.h compile error and also zib/crc32.c won't compile at all.

Regards,
Hiro

On Sat, 25 May 2019 01:58:00 +0000 (UTC)
Xin LI <delphij at FreeBSD.org> wrote:

> Author: delphij
> Date: Sat May 25 01:58:00 2019
> New Revision: 348261
> URL: https://svnweb.freebsd.org/changeset/base/348261
> 
> 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>
>   Approved by:	re (kib)
> 
> Added:
>      - copied from r347244, head/sys/contrib/zlib/
> Directory Properties:
>   stable/11/sys/contrib/zlib/   (props changed)
> Deleted:
>   stable/11/contrib/zlib/
> Modified:
>   stable/11/lib/libz/FREEBSD-upgrade
>   stable/11/lib/libz/Makefile
>   stable/11/stand/libsa/Makefile
>   stable/11/usr.bin/minigzip/Makefile
> Directory Properties:
>   stable/11/   (props changed)
> 
> Modified: stable/11/lib/libz/FREEBSD-upgrade
> ==============================================================================
> --- stable/11/lib/libz/FREEBSD-upgrade	Sat May 25 00:22:07 2019	(r348260)
> +++ stable/11/lib/libz/FREEBSD-upgrade	Sat May 25 01:58:00 2019	(r348261)
> @@ -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/11/lib/libz/Makefile
> ==============================================================================
> --- stable/11/lib/libz/Makefile	Sat May 25 00:22:07 2019	(r348260)
> +++ stable/11/lib/libz/Makefile	Sat May 25 01:58:00 2019	(r348261)
> @@ -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/11/stand/libsa/Makefile
> ==============================================================================
> --- stable/11/stand/libsa/Makefile	Sat May 25 00:22:07 2019	(r348260)
> +++ stable/11/stand/libsa/Makefile	Sat May 25 01:58:00 2019	(r348261)
> @@ -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/11/usr.bin/minigzip/Makefile
> ==============================================================================
> --- stable/11/usr.bin/minigzip/Makefile	Sat May 25 00:22:07 2019	(r348260)
> +++ stable/11/usr.bin/minigzip/Makefile	Sat May 25 01:58:00 2019	(r348261)
> @@ -1,6 +1,6 @@
>  # $FreeBSD$
>  
> -SRCDIR=	${SRCTOP}/contrib/zlib/test
> +SRCDIR=	${SRCTOP}/sys/contrib/zlib/test
>  .PATH:	${SRCDIR}
>  
>  PROG=	minigzip
> _______________________________________________
> svn-src-all at freebsd.org mailing list
> https://lists.freebsd.org/mailman/listinfo/svn-src-all
> To unsubscribe, send any mail to "svn-src-all-unsubscribe at freebsd.org"