Re: [Minios-devel] [UNIKRAFT/SQLITE V3 PATCH 2/5] Add Makefile.uk

[Costin Lupu <costin.lup@xxxxxxxxx>]

Hi Gaulthier,

Please see inline.

On 12/4/19 7:52 PM, Gaulthier Gain wrote:
> Add SQLite port Makefile.uk.
> 
> Signed-off-by: Gaulthier Gain <gaulthier.gain@xxxxxxxxx>
> ---
>  Makefile.uk | 87 
> +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
>  1 file changed, 87 insertions(+)
>  create mode 100644 Makefile.uk
> 
> diff --git a/Makefile.uk b/Makefile.uk
> new file mode 100644
> index 0000000..9b7fa06
> --- /dev/null
> +++ b/Makefile.uk
> @@ -0,0 +1,87 @@
> +#  SPDX-License-Identifier: BSD-3-Clause
> +#
> +#  SQLite Makefile.uk
> +#
> +#  Authors: Gain Gaulthier <gaulthier.gain@xxxxxxxxx>
> +#
> +#  Copyright (c) 2019, University of Liege. 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.
> +#
> +
> +################################################################################
> +# App registration
> +################################################################################
> +$(eval $(call addlib,libsqlite))
> +
> +################################################################################
> +# Sources
> +################################################################################
> +LIBSQLITE_VERSION = 3300100
> +LIBSQLITE_BASENAME = sqlite-amalgamation-$(LIBSQLITE_VERSION)
> +LIBSQLITE_URL = https://www.sqlite.org/2019/$(LIBSQLITE_BASENAME).zip
> +LIBSQLITE_PATCHDIR = $(LIBSQLITE_BASE)/patches
> +$(eval $(call fetch,libsqlite,$(LIBSQLITE_URL)))
> +$(eval $(call 
> patch,libsqlite,$(LIBSQLITE_PATCHDIR),sqlite-amalgamation-$(LIBSQLITE_VERSION)))

s/sqlite-amalgamation-$(LIBSQLITE_VERSION)/$(LIBSQLITE_BASENAME)

> +
> +################################################################################
> +# Helpers
> +################################################################################
> +LIBSQLITE_SRC = $(LIBSQLITE_ORIGIN)/$(LIBSQLITE_BASENAME)
> +
> +################################################################################
> +# Library includes
> +################################################################################
> +LIBSQLITE_CINCLUDES-y += -I$(LIBSQLITE_BASE)/include
> +LIBSQLITE_CINCLUDES += -I$(LIBSQLITE_SRC)
> +
> +################################################################################
> +# Global flags
> +################################################################################
> +LIBSQLITE_FLAGS = -D_HAVE_SQLITE_CONFIG_H -DSQLITE_OMIT_LOAD_EXTENSION
> +
> +# Suppress some warnings to make the build process look neater
> +LIBSQLITE_SUPPRESS_FLAGS += -Wno-unused-parameter -Wno-unused-variable       
>         \
> +-Wno-cast-function-type -Wno-char-subscripts -Wimplicit-fallthrough=0        
>         \
> +
> +LIBSQLITE_CFLAGS-y += $(LIBSQLITE_FLAGS)
> +LIBSQLITE_CFLAGS-y += $(LIBSQLITE_SUPPRESS_FLAGS)
> +
> +################################################################################
> +# Glue code
> +################################################################################
> +LIBSQLITE_SRCS-$(CONFIG_LIBSQLITE_MAIN_FUNCTION) += $(LIBSQLITE_BASE)/main.c

This should be added with patch 3.

> +
> +################################################################################
> +# SQLite sources
> +################################################################################
> +LIBSQLITE_SQLITE_FLAGS-y += -Dmain=sqlite_main

This makes no sense, we should remove it. Please see more related
comments in my reply to patch 4.

> +
> +# Core
> +LIBSQLITE_SRCS-y += $(LIBSQLITE_SRC)/shell.c
> +LIBSQLITE_SRCS-y += $(LIBSQLITE_SRC)/sqlite3.c
> 

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