Re: [Minios-devel] [UNIKRAFT/LIBUUID PATCH v3 2/2] Initial port of the libuuid library (version 1.0.3).

[Sharan Santhanam <sharan.santhanam@xxxxxxxxx>]

On 8/30/19 5:41 PM, Simon Kuenzer wrote:
> On 24.07.19 15:59, Felipe Huici wrote:
> > Note newlib is required.
> >
> > Signed-off-by: Felipe Huici <felipe.huici@xxxxxxxxx>
> > ---
> >   Config.uk                                      |   5 +
> >   Makefile.uk                                    | 126 
> > +++++++++++++++++++++++++
> >   exportsyms.uk                                  |  17 ++++
> >   include/config.h                               |  77 +++++++++++++++
> >   patches/0001-add-syscall-h-compile-guard.patch |  12 +++
> >   5 files changed, 237 insertions(+)
> >   create mode 100644 Config.uk
> >   create mode 100644 Makefile.uk
> >   create mode 100644 exportsyms.uk
> >   create mode 100644 include/config.h
> >   create mode 100644 patches/0001-add-syscall-h-compile-guard.patch
> >
> > diff --git a/Config.uk b/Config.uk
> > new file mode 100644
> > index 0000000..e52870a
> > --- /dev/null
> > +++ b/Config.uk
> > @@ -0,0 +1,5 @@
> > +menuconfig LIBUUID
> > +       bool "libuuid - library for unique id generation"
> > +       default n
> > +           depends on HAVE_LIBC
> > +           select UKUNISTD
> > diff --git a/Makefile.uk b/Makefile.uk
> > new file mode 100644
> > index 0000000..4f66857
> > --- /dev/null
> > +++ b/Makefile.uk
> > @@ -0,0 +1,126 @@
> > +#  libuuid Makefile.uc
> > +#
> > +#  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,libuuid,$(CONFIG_LIBUUID)))
> > +
> > +################################################################################ 
> >
> > +# Sources
> > +################################################################################ 
> >
> > +LIBUUID_VERSION=1.0.3
> > +LIBUUID_URL=https://sourceforge.net/projects/libuuid/files/libuuid-$(LIBUUID_VERSION).tar.gz/download 
> >
> > +LIBUUID_PATCHDIR=$(LIBUUID_BASE)/patches
> > +$(eval $(call fetchas,libuuid,$(LIBUUID_URL),$(LIBUUID_VERSION).tgz))
> > +$(eval $(call 
> > patch,libuuid,$(LIBUUID_PATCHDIR),libuuid-$(LIBUUID_VERSION)))
> > +
> > +################################################################################ 
> >
> > +# Helpers
> > +################################################################################ 
> >
> > +LIBUUID_SUBDIR=libuuid-$(LIBUUID_VERSION)
> > +LIBUUID_SRC=$(LIBUUID_ORIGIN)/$(LIBUUID_SUBDIR)
> > +
> > +################################################################################ 
> >
> > +# Library includes
> > +################################################################################ 
> >
> > +# Put public headers (uuid.h) in a public folder and export them 
> > globally. The
> > +# prepare step below takes care of populating the folder.
> > +$(call mk_sub_build_dir,libuuid/include/public)
> > +CINCLUDES-$(CONFIG_LIBUUID) += -I$(LIBUUID_BUILD)/include/public
> > +
> > +# Put private headers (the glue's config.h, and uuid's non-uuid.h 
> > headers)
> > +# in a private folder and export that only locally to libuuid. The 
> > prepare
> > +# step below takes care of populating the folder
> > +$(call mk_sub_build_dir,libuuid/include/private)
> > +LIBUUID_CINCLUDES-y += -I$(LIBUUID_BUILD)/include/private
> > +
> > +################################################################################ 
> >
> > +# Global flags
> > +################################################################################ 
> >
> > +LIBUUID_CFLAGS-y += -DHAVE_CONFIG_H
> > +
> > +# Suppress some warnings to make the build process look neater
> > +LIBUUID_SUPPRESS_FLAGS += -Wno-unused-parameter 
> > -Wno-unused-variable            \
> > +-Wno-nonnull -Wno-unused-but-set-variable -Wno-unused-label 
> > -Wno-char-subscripts\
> > +-Wno-unused-function -Wno-missing-field-initializers 
> > -Wno-uninitialized         \
> > +-Wno-maybe-uninitialized -Wno-pointer-sign 
> > -Wno-unused-value                    \
> > +-Wno-unused-macros -Wno-parentheses 
> > -Wno-implicit-function-declaration          \
> > +-Wno-missing-braces -Wno-endif-labels 
> > -Wno-unused-but-set-variable              \
> > +-Wno-implicit-function-declaration
> > +
> > +LIBUUID_CFLAGS-y   += $(LIBUUID_SUPPRESS_FLAGS)
> > +LIBUUID_CXXFLAGS-y += $(LIBUUID_SUPPRESS_FLAGS)
> > +
> > +################################################################################ 
> >
> > +# Sources
> > +################################################################################ 
> >
> > +LIBUUID_SRCS-y += $(LIBUUID_SRC)/clear.c
> > +LIBUUID_SRCS-y += $(LIBUUID_SRC)/copy.c
> > +LIBUUID_SRCS-y += $(LIBUUID_SRC)/isnull.c
> > +LIBUUID_SRCS-y += $(LIBUUID_SRC)/parse.c
> > +LIBUUID_SRCS-y += $(LIBUUID_SRC)/unparse.c
> > +LIBUUID_SRCS-y += $(LIBUUID_SRC)/compare.c
> > +LIBUUID_SRCS-y += $(LIBUUID_SRC)/gen_uuid.c
> > +LIBUUID_SRCS-y += $(LIBUUID_SRC)/pack.c
> > +LIBUUID_SRCS-y += $(LIBUUID_SRC)/randutils.c
> > +LIBUUID_SRCS-y += $(LIBUUID_SRC)/unpack.c
> > +LIBUUID_SRCS-y += $(LIBUUID_SRC)/uuid_time.c
> > +
> > +################################################################################ 
> >
> > +# Lib-specific Targets
> > +################################################################################ 
> >
> > +$(LIBUUID_BUILD)/include/public/%.h: $(LIBUUID_SRC)/%.h
> > +    $(call build_cmd,LN,libuuid,$@,\
> > +    ln -sf $< $@)
> > +
> > +$(LIBUUID_BUILD)/include/private/%.h: $(LIBUUID_SRC)/%.h
> > +    $(call build_cmd,LN,libuuid,$@,\
> > +    ln -sf $< $@)
> If you just type "make", I noticed that this wildcard rules get 
> executed before the archive is extracted. I got it solved by adding 
> the following rule to state the dependency:
> $(LIBUUID_SRC)/%.h: $(LIBUUID_BUILD)/.origin
>     @# empty recipe to enforce dependency to archive extraction
Would recommend using @: instead of @#. This represent a noop
> At this point I have no clue why this only works with a filled-out 
> recipe, even if it is non-sense. It looks like that Make is doing some 
> magic internal simplification if you state the dependency without recipe.
> > +
> > +$(LIBUUID_BUILD)/include/private/config.h: 
> > $(LIBUUID_BASE)/include/config.h
> > +    $(call build_cmd,LN,libuuid,$@,\
> > +    ln -sf $< $(LIBUUID_BUILD)/include/private/config.h)
> > +
> > +# public headers
> > +UK_PREPARE += $(LIBUUID_BUILD)/include/public/uuid.h
> > +
> > +# private headers
> > +UK_PREPARE += $(LIBUUID_BUILD)/include/private/all-io.h
> > +UK_PREPARE += $(LIBUUID_BUILD)/include/private/c.h
> > +UK_PREPARE += $(LIBUUID_BUILD)/include/private/randutils.h
> > +UK_PREPARE += $(LIBUUID_BUILD)/include/private/uuidd.h
> > +UK_PREPARE += $(LIBUUID_BUILD)/include/private/uuidP.h
> > +UK_PREPARE += $(LIBUUID_BUILD)/include/private/config.h
> > \ No newline at end of file
> > diff --git a/exportsyms.uk b/exportsyms.uk
> > new file mode 100644
> > index 0000000..0c62271
> > --- /dev/null
> > +++ b/exportsyms.uk
> > @@ -0,0 +1,17 @@
> > +uuid_clear
> > +uuid_compare
> > +uuid_copy
> > +uuid_generate
> > +uuid_generate_random
> > +uuid_generate_time
> > +uuid_generate_time_safe
> > +uuid_is_null
> > +uuid_pack
> > +uuid_parse
> > +uuid_time
> > +uuid_type
> > +uuid_unpack
> > +uuid_unparse
> > +uuid_unparse_lower
> > +uuid_unparse_upper
> > +uuid_variant
> > diff --git a/include/config.h b/include/config.h
> > new file mode 100644
> > index 0000000..19840ad
> > --- /dev/null
> > +++ b/include/config.h
> > @@ -0,0 +1,77 @@
> > +/* config.h.  Generated from config.h.in by libuuid's configure.  */
> > +/* config.h.in.  Generated from configure.ac by autoheader.  */
> > +
> > +/* Define to 1 if you have the <fcntl.h> header file. */
> > +#define HAVE_FCNTL_H 1
> > +
> > +/* Define to 1 if you have the `ftruncate' function. */
> > +#define HAVE_FTRUNCATE 1
> > +
> > +/* Define to 1 if you have the `gettimeofday' function. */
> > +#define HAVE_GETTIMEOFDAY 1
> > +
> > +/* Define to 1 if you have the <inttypes.h> header file. */
> > +#define HAVE_INTTYPES_H 1
> > +
> > +/* Define to 1 if you have the <limits.h> header file. */
> > +#define HAVE_LIMITS_H 1
> > +
> > +/* Define to 1 if you have the <memory.h> header file. */
> > +#define HAVE_MEMORY_H 1
> > +
> > +/* Define to 1 if you have the `memset' function. */
> > +#define HAVE_MEMSET 1
> > +
> > +/* Define to 1 if you have the <netinet/in.h> header file. */
> > +#ifdef $(HAVE_NW_STACK)
> > +#define HAVE_NETINET_IN_H 1
> > +#endif
> > +
> > +/* Define to 1 if you have the `socket' function. */
> > +#ifdef $(HAVE_NW_STACK)
> > +#define HAVE_SOCKET 1
> > +#endif
> > +
> > +/* Define to 1 if you have the `srandom' function. */
> > +#define HAVE_SRANDOM 1
> > +
> > +/* Define to 1 if you have the <stdint.h> header file. */
> > +#define HAVE_STDINT_H 1
> > +
> > +/* Define to 1 if you have the <stdlib.h> header file. */
> > +#define HAVE_STDLIB_H 1
> > +
> > +/* Define to 1 if you have the <strings.h> header file. */
> > +#define HAVE_STRINGS_H 1
> > +
> > +/* Define to 1 if you have the <string.h> header file. */
> > +#define HAVE_STRING_H 1
> > +
> > +/* Define to 1 if you have the `strtoul' function. */
> > +#define HAVE_STRTOUL 1
> > +
> > +/* Define to 1 if you have the <sys/file.h> header file. */
> > +#define HAVE_SYS_FILE_H 1
> > +
> > +/* Define to 1 if you have the <sys/ioctl.h> header file. */
> > +#define HAVE_SYS_IOCTL_H 1
> > +
> > +/* Define to 1 if you have the <sys/socket.h> header file. */
> > +#ifdef $(HAVE_NW_STACK)
> > +#define HAVE_SYS_SOCKET_H 1
> > +#endif
> > +
> > +/* Define to 1 if you have the <sys/stat.h> header file. */
> > +#define HAVE_SYS_STAT_H 1
> > +
> > +/* Define to 1 if you have the <sys/time.h> header file. */
> > +#define HAVE_SYS_TIME_H 1
> > +
> > +/* Define to 1 if you have the <sys/types.h> header file. */
> > +#define HAVE_SYS_TYPES_H 1
> > +
> > +/* Define to 1 if you have the <unistd.h> header file. */
> > +#define HAVE_UNISTD_H 1
> > +
> > +/* Define to 1 if you have the `usleep' function. */
> > +#define HAVE_USLEEP 1
> > diff --git a/patches/0001-add-syscall-h-compile-guard.patch 
> > b/patches/0001-add-syscall-h-compile-guard.patch
> > new file mode 100644
> > index 0000000..adea66a
> > --- /dev/null
> > +++ b/patches/0001-add-syscall-h-compile-guard.patch
> > @@ -0,0 +1,12 @@
> > +--- a/randutils.c    2019-04-03 14:46:14.827682485 +0200
> > ++++ b/randutils.c    2019-04-03 14:46:48.375286950 +0200
> > +@@ -13,7 +13,9 @@
> > + #include <string.h>
> > + #include <sys/time.h>
> > +
> > ++#ifdef DO_JRAND_MIX
> > + #include <sys/syscall.h>
> > ++#endif
> > +
> > + #include "randutils.h"
> > +
> _______________________________________________
> Minios-devel mailing list
> Minios-devel@xxxxxxxxxxxxxxxxxxxx
> https://lists.xenproject.org/mailman/listinfo/minios-devel
_______________________________________________
Minios-devel mailing list
Minios-devel@xxxxxxxxxxxxxxxxxxxx
https://lists.xenproject.org/mailman/listinfo/minios-devel