Re: [Minios-devel] [UNIKRAFT/LIBZLIB PATCH v3 2/3] Add Makefile.uk

[Costin Lupu <costin.lup@xxxxxxxxx>]

Hi Felipe,

You have some warnings when building zlib. Some of them are inoffensive
and need to be suppressed by copying SUPRESSED_FLAGS from here
https://github.com/clupuishere/pcre/blob/master/Makefile.uk#L72 . But
the -Wimplicit-function-declaration warnings are there because zconf.h
header doesn't exist - it is generated by `./configure` command so maybe
you should also add a prepare rule to run it (another option would be
simply committing the zconf.h in the glue).

Please see another minor one inline.

On 8/14/19 11:36 AM, Felipe Huici wrote:
> This is a port of zlib to Unikraft as an external library. It requires
> libc, so in your application Makefile the library dependency list
> should read:
> 
>            LIBS := ...:$(UK_LIBS)/newlib:$(UK_LIBS)/zlib:...
> 
> Signed-off-by: Felipe Huici <felipe.huici@xxxxxxxxx>
> ---
>  Makefile.uk | 78 
> +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
>  1 file changed, 78 insertions(+)
>  create mode 100644 Makefile.uk
> 
> diff --git a/Makefile.uk b/Makefile.uk
> new file mode 100644
> index 0000000..bea7fd3
> --- /dev/null
> +++ b/Makefile.uk
> @@ -0,0 +1,78 @@
> +#  libzlib Makefile.uk
> +#
> +#  Authors: Felipe Huici <felipe.huici@xxxxxxxxx>
> +#
> +#
> +#  Copyright (c) 2019, NEC Europe Ltd., NEC Corporation. All rights reserved.
> +#
> +#  Redistribution and use in source and binary forms, with or without
> +#  modification, are permitted provided that the following conditions
> +#  are met:
> +#
> +#  1. Redistributions of source code must retain the above copyright
> +#     notice, this list of conditions and the following disclaimer.
> +#  2. Redistributions in binary form must reproduce the above copyright
> +#     notice, this list of conditions and the following disclaimer in the
> +#     documentation and/or other materials provided with the distribution.
> +#  3. Neither the name of the copyright holder nor the names of its
> +#     contributors may be used to endorse or promote products derived from
> +#     this software without specific prior written permission.
> +#
> +#  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS 
> IS"
> +#  AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
> +#  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
> +#  ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
> +#  LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
> +#  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
> +#  SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
> +#  INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
> +#  CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
> +#  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
> +#  POSSIBILITY OF SUCH DAMAGE.
> +#
> +#  THIS HEADER MAY NOT BE EXTRACTED OR MODIFIED IN ANY WAY.
> +#
> +
> +################################################################################
> +# Library registration
> +################################################################################
> +$(eval $(call addlib_s,libzlib,$(CONFIG_LIBZLIB)))
> +
> +################################################################################
> +# Sources
> +################################################################################
> +LIBZLIB_VERSION=1.2.11
> +LIBZLIB_URL=http://www.zlib.net/zlib-$(LIBZLIB_VERSION).tar.gz
> +LIBZLIB_DIR=zlib-$(LIBZLIB_VERSION)
> +
> +$(eval $(call fetch,libzlib,$(LIBZLIB_URL),$(LIBZLIB_VERSION).tar.gz))
> +
> +################################################################################
> +# Helpers
> +################################################################################
> +LIBZLIB=$(LIBZLIB_ORIGIN)/$(LIBZLIB_DIR)
> +
> +################################################################################
> +# Library includes
> +################################################################################
> +CINCLUDES-$(CONFIG_LIBZLIB)   += -I$(LIBZLIB)     

Nitpicking: you have some extra whitespaces at the end of the line
above. If we use this zlib port as an example we might propagate this in
other external libs as well.

> +CXXINCLUDES-$(CONFIG_LIBZLIB) += -I$(LIBZLIB)
> +
> +################################################################################
> +# Sources
> +################################################################################
> +LIBZLIB_SRCS-y += $(LIBZLIB)/inflate.c
> +LIBZLIB_SRCS-y += $(LIBZLIB)/gzclose.c
> +LIBZLIB_SRCS-y += $(LIBZLIB)/zutil.c
> +LIBZLIB_SRCS-y += $(LIBZLIB)/crc32.c
> +LIBZLIB_SRCS-y += $(LIBZLIB)/uncompr.c
> +LIBZLIB_SRCS-y += $(LIBZLIB)/gzread.c
> +LIBZLIB_SRCS-y += $(LIBZLIB)/trees.c
> +LIBZLIB_SRCS-y += $(LIBZLIB)/gzlib.c
> +LIBZLIB_SRCS-y += $(LIBZLIB)/infback.c
> +LIBZLIB_SRCS-y += $(LIBZLIB)/gzwrite.c
> +LIBZLIB_SRCS-y += $(LIBZLIB)/compress.c
> +LIBZLIB_SRCS-y += $(LIBZLIB)/inftrees.c
> +LIBZLIB_SRCS-y += $(LIBZLIB)/deflate.c
> +LIBZLIB_SRCS-y += $(LIBZLIB)/adler32.c
> +LIBZLIB_SRCS-y += $(LIBZLIB)/inffast.c
> 

_______________________________________________
Minios-devel mailing list
Minios-devel@xxxxxxxxxxxxxxxxxxxx
https://lists.xenproject.org/mailman/listinfo/minios-devel