Synchronize musl with POSIX-Process internal libs

Signed-off-by: gaulthier gain <[email protected]> Tested-by: Unikraft CI <[email protected]> GitHub-Pull-Request: unikraft#3
eduardvintila · Oct 13, 2021 · 0cebe66 · 0cebe66
1 parent 7b217d6
commit 0cebe66
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 1 deletion.
diff --git 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
@@ -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
@@ -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
@@ -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