Synchronize musl with POSIX-Process internal libs

Signed-off-by: gaulthier gain <gaulthier.gain@uliege.be>
Tested-by: Unikraft CI <monkey@unikraft.io>
GitHub-Pull-Request: #3

diff --git a/Makefile.uk.musl.conf b/Makefile.uk.musl.conf
index e4e49de071ea0a0f0a255b1eb466d10a5f9d6c55..f041722cd5a88cb64d3a8a38b1bc549d5d9fd8f9 100644 (file)
--- a/Makefile.uk.musl.conf
+++ b/Makefile.uk.musl.conf
@@ -8,10 +8,12 @@ LIBMUSL_CONF_HDRS-y += $(LIBMUSL)/include/sys/resource.h
 LIBMUSL_CONF_HDRS-y += $(LIBMUSL)/include/sys/sysinfo.h
 LIBMUSL_CONF_HDRS-y += $(LIBMUSL)/include/unistd.h
 
+ifneq ($(CONFIG_LIBPOSIX_SYSINFO),y)
 LIBMUSL_CONF_SRCS-y += $(LIBMUSL)/src/conf/confstr.c
 LIBMUSL_CONF_SRCS-y += $(LIBMUSL)/src/conf/fpathconf.c
 LIBMUSL_CONF_SRCS-y += $(LIBMUSL)/src/conf/legacy.c
 LIBMUSL_CONF_SRCS-y += $(LIBMUSL)/src/conf/pathconf.c
 LIBMUSL_CONF_SRCS-y += $(LIBMUSL)/src/conf/sysconf.c
+endif
 
 $(eval $(call _libmusl_import_lib,conf,$(LIBMUSL_CONF_HDRS-y),$(LIBMUSL_CONF_SRCS-y)))

diff --git a/Makefile.uk.musl.legacy b/Makefile.uk.musl.legacy
index 3671f289afa40a29e8c2b5566514a6f16cfc0230..d9d036c895dca4db1082eeef47a6ab2261d3339d 100644 (file)
--- a/Makefile.uk.musl.legacy
+++ b/Makefile.uk.musl.legacy
@@ -28,7 +28,9 @@ LIBMUSL_LEGACY_SRCS-y += $(LIBMUSL)/src/legacy/ftw.c
 #LIBMUSL_LEGACY_SRCS-y += $(LIBMUSL)/src/legacy/futimes.c
 LIBMUSL_LEGACY_SRCS-y += $(LIBMUSL)/src/legacy/getdtablesize.c
 LIBMUSL_LEGACY_SRCS-y += $(LIBMUSL)/src/legacy/getloadavg.c
+ifneq ($(CONFIG_LIBPOSIX_SYSINFO),y)
 LIBMUSL_LEGACY_SRCS-y += $(LIBMUSL)/src/legacy/getpagesize.c
+endif
 LIBMUSL_LEGACY_SRCS-y += $(LIBMUSL)/src/legacy/getpass.c
 LIBMUSL_LEGACY_SRCS-y += $(LIBMUSL)/src/legacy/getusershell.c
 LIBMUSL_LEGACY_SRCS-y += $(LIBMUSL)/src/legacy/isastream.c

diff --git a/Makefile.uk.musl.misc b/Makefile.uk.musl.misc
index acc14abbd14222a7adeb5ee80431042c35649883..c82827c15e67da19c56cecc1a1c1fff69a6cd098 100644 (file)
--- a/Makefile.uk.musl.misc
+++ b/Makefile.uk.musl.misc
@@ -75,7 +75,9 @@ LIBMUSL_MISC_SRCS-y += $(LIBMUSL)/src/misc/setdomainname.c
 LIBMUSL_MISC_SRCS-y += $(LIBMUSL)/src/misc/setrlimit.c
 #LIBMUSL_MISC_SRCS-y += $(LIBMUSL)/src/misc/syscall.c|misc
 LIBMUSL_MISC_SRCS-y += $(LIBMUSL)/src/misc/syslog.c
+ifneq ($(CONFIG_LIBPOSIX_SYSINFO),y)
 LIBMUSL_MISC_SRCS-y += $(LIBMUSL)/src/misc/uname.c
+endif
 LIBMUSL_MISC_SRCS-y += $(LIBMUSL)/src/misc/wordexp.c
 
 $(eval $(call _libmusl_import_lib,misc,$(LIBMUSL_MISC_HDRS-y),$(LIBMUSL_MISC_SRCS-y)))

diff --git a/Makefile.uk.musl.unistd b/Makefile.uk.musl.unistd
index ccf081aae4f1fc6fd258fe1a535ee95f2fcb3c73..4a4a0901936165de97c973f8741e142b0ecd8231 100644 (file)
--- a/Makefile.uk.musl.unistd
+++ b/Makefile.uk.musl.unistd
@@ -46,7 +46,9 @@ LIBMUSL_UNISTD_SRCS-y += $(LIBMUSL)/src/unistd/getgroups.c
 LIBMUSL_UNISTD_SRCS-y += $(LIBMUSL)/src/unistd/getlogin.c
 LIBMUSL_UNISTD_SRCS-y += $(LIBMUSL)/src/unistd/getlogin_r.c
 LIBMUSL_UNISTD_SRCS-y += $(LIBMUSL)/src/unistd/getuid.c
-else
+endif
+
+ifneq ($(CONFIG_LIBPOSIX_SYSINFO),y)
 LIBMUSL_UNISTD_SRCS-y += $(LIBMUSL)/src/unistd/gethostname.c
 endif