[Minios-devel] [UNIKRAFT/MUSL PATCH 18/19] Update Makefiles to exclude functions to avoid multiple definitions

[Gaulthier Gain <gaulthier.gain@xxxxxxxxx>]

This commit leaves out all internal functions that are redefined with
the process glue code in order to avoid linking errors. This is the
first commit where musl LINKS.

Signed-off-by: Gaulthier Gain <gaulthier.gain@xxxxxxxxx>
---
 Makefile.uk.musl.linux   |  4 ++--
 Makefile.uk.musl.process |  2 +-
 Makefile.uk.musl.stdio   |  4 ++--
 Makefile.uk.musl.unistd  | 22 +++++++++++-----------
 4 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/Makefile.uk.musl.linux b/Makefile.uk.musl.linux
index cf23d9a..dee459e 100644
--- a/Makefile.uk.musl.linux
+++ b/Makefile.uk.musl.linux
@@ -50,8 +50,8 @@ LIBMUSL_SRCS-y += $(LIBMUSL)/src/linux/unshare.c
 LIBMUSL_SRCS-y += $(LIBMUSL)/src/linux/utimes.c
 LIBMUSL_SRCS-y += $(LIBMUSL)/src/linux/vhangup.c
 LIBMUSL_SRCS-y += $(LIBMUSL)/src/linux/vmsplice.c
-LIBMUSL_SRCS-y += $(LIBMUSL)/src/linux/wait3.c
-LIBMUSL_SRCS-y += $(LIBMUSL)/src/linux/wait4.c
+#LIBMUSL_SRCS-y += $(LIBMUSL)/src/linux/wait3.c
+#LIBMUSL_SRCS-y += $(LIBMUSL)/src/linux/wait4.c
 LIBMUSL_SRCS-y += $(LIBMUSL)/src/linux/xattr.c
 
 #LIBMUSL_SRCS-y += $(LIBMUSL)/src/linux/x32/sysinfo.c
diff --git a/Makefile.uk.musl.process b/Makefile.uk.musl.process
index 1c1effc..8f50ca2 100644
--- a/Makefile.uk.musl.process
+++ b/Makefile.uk.musl.process
@@ -27,7 +27,7 @@ LIBMUSL_SRCS-y += 
$(LIBMUSL)/src/process/posix_spawn_file_actions_init.c
 #LIBMUSL_SRCS-y += $(LIBMUSL)/src/process/system.c
 #LIBMUSL_SRCS-y += $(LIBMUSL)/src/process/wait.c
 #LIBMUSL_SRCS-y += $(LIBMUSL)/src/process/waitid.c
-LIBMUSL_SRCS-y += $(LIBMUSL)/src/process/waitpid.c
+#LIBMUSL_SRCS-y += $(LIBMUSL)/src/process/waitpid.c
 
 ifeq (x86_32,$(CONFIG_UK_ARCH))
 LIBMUSL_SRCS-y += $(LIBMUSL)/src/process/i386/vfork.s|i386
diff --git a/Makefile.uk.musl.stdio b/Makefile.uk.musl.stdio
index b27f722..2a47b9b 100644
--- a/Makefile.uk.musl.stdio
+++ b/Makefile.uk.musl.stdio
@@ -65,9 +65,9 @@ LIBMUSL_SRCS-y += $(LIBMUSL)/src/stdio/ofl.c
 LIBMUSL_SRCS-y += $(LIBMUSL)/src/stdio/ofl_add.c
 LIBMUSL_SRCS-y += $(LIBMUSL)/src/stdio/open_memstream.c
 LIBMUSL_SRCS-y += $(LIBMUSL)/src/stdio/open_wmemstream.c
-LIBMUSL_SRCS-y += $(LIBMUSL)/src/stdio/pclose.c
+#LIBMUSL_SRCS-y += $(LIBMUSL)/src/stdio/pclose.c
 LIBMUSL_SRCS-y += $(LIBMUSL)/src/stdio/perror.c
-LIBMUSL_SRCS-y += $(LIBMUSL)/src/stdio/popen.c
+#LIBMUSL_SRCS-y += $(LIBMUSL)/src/stdio/popen.c
 LIBMUSL_SRCS-y += $(LIBMUSL)/src/stdio/printf.c
 LIBMUSL_SRCS-y += $(LIBMUSL)/src/stdio/putc.c
 LIBMUSL_SRCS-y += $(LIBMUSL)/src/stdio/putc_unlocked.c
diff --git a/Makefile.uk.musl.unistd b/Makefile.uk.musl.unistd
index 4a76eeb..6b687b6 100644
--- a/Makefile.uk.musl.unistd
+++ b/Makefile.uk.musl.unistd
@@ -24,18 +24,18 @@ LIBMUSL_SRCS-y += $(LIBMUSL)/src/unistd/getgid.c
 LIBMUSL_SRCS-y += $(LIBMUSL)/src/unistd/gethostname.c
 LIBMUSL_SRCS-y += $(LIBMUSL)/src/unistd/getlogin.c
 LIBMUSL_SRCS-y += $(LIBMUSL)/src/unistd/getlogin_r.c
-LIBMUSL_SRCS-y += $(LIBMUSL)/src/unistd/getpgid.c
-LIBMUSL_SRCS-y += $(LIBMUSL)/src/unistd/getpgrp.c
-LIBMUSL_SRCS-y += $(LIBMUSL)/src/unistd/getpid.c
-LIBMUSL_SRCS-y += $(LIBMUSL)/src/unistd/getppid.c
-LIBMUSL_SRCS-y += $(LIBMUSL)/src/unistd/getsid.c
+#LIBMUSL_SRCS-y += $(LIBMUSL)/src/unistd/getpgid.c
+#LIBMUSL_SRCS-y += $(LIBMUSL)/src/unistd/getpgrp.c
+#LIBMUSL_SRCS-y += $(LIBMUSL)/src/unistd/getpid.c
+#LIBMUSL_SRCS-y += $(LIBMUSL)/src/unistd/getppid.c
+#LIBMUSL_SRCS-y += $(LIBMUSL)/src/unistd/getsid.c
 LIBMUSL_SRCS-y += $(LIBMUSL)/src/unistd/getuid.c
 LIBMUSL_SRCS-y += $(LIBMUSL)/src/unistd/isatty.c
 #LIBMUSL_SRCS-y += $(LIBMUSL)/src/unistd/lchown.c
 #LIBMUSL_SRCS-y += $(LIBMUSL)/src/unistd/link.c
 LIBMUSL_SRCS-y += $(LIBMUSL)/src/unistd/linkat.c
 #LIBMUSL_SRCS-y += $(LIBMUSL)/src/unistd/lseek.c
-LIBMUSL_SRCS-y += $(LIBMUSL)/src/unistd/nice.c
+#LIBMUSL_SRCS-y += $(LIBMUSL)/src/unistd/nice.c
 LIBMUSL_SRCS-y += $(LIBMUSL)/src/unistd/pause.c
 #LIBMUSL_SRCS-y += $(LIBMUSL)/src/unistd/pipe.c
 LIBMUSL_SRCS-y += $(LIBMUSL)/src/unistd/pipe2.c
@@ -53,21 +53,21 @@ LIBMUSL_SRCS-y += $(LIBMUSL)/src/unistd/renameat.c
 LIBMUSL_SRCS-y += $(LIBMUSL)/src/unistd/setegid.c
 LIBMUSL_SRCS-y += $(LIBMUSL)/src/unistd/seteuid.c
 LIBMUSL_SRCS-y += $(LIBMUSL)/src/unistd/setgid.c
-LIBMUSL_SRCS-y += $(LIBMUSL)/src/unistd/setpgid.c
-LIBMUSL_SRCS-y += $(LIBMUSL)/src/unistd/setpgrp.c
+#LIBMUSL_SRCS-y += $(LIBMUSL)/src/unistd/setpgid.c
+#LIBMUSL_SRCS-y += $(LIBMUSL)/src/unistd/setpgrp.c
 #LIBMUSL_SRCS-y += $(LIBMUSL)/src/unistd/setregid.c
 #LIBMUSL_SRCS-y += $(LIBMUSL)/src/unistd/setresgid.c
 #LIBMUSL_SRCS-y += $(LIBMUSL)/src/unistd/setresuid.c
 #LIBMUSL_SRCS-y += $(LIBMUSL)/src/unistd/setreuid.c
-LIBMUSL_SRCS-y += $(LIBMUSL)/src/unistd/setsid.c
+#LIBMUSL_SRCS-y += $(LIBMUSL)/src/unistd/setsid.c
 LIBMUSL_SRCS-y += $(LIBMUSL)/src/unistd/setuid.c
 LIBMUSL_SRCS-y += $(LIBMUSL)/src/unistd/setxid.c
 LIBMUSL_SRCS-y += $(LIBMUSL)/src/unistd/sleep.c
 #LIBMUSL_SRCS-y += $(LIBMUSL)/src/unistd/symlink.c
 LIBMUSL_SRCS-y += $(LIBMUSL)/src/unistd/symlinkat.c
 #LIBMUSL_SRCS-y += $(LIBMUSL)/src/unistd/sync.c
-LIBMUSL_SRCS-y += $(LIBMUSL)/src/unistd/tcgetpgrp.c
-LIBMUSL_SRCS-y += $(LIBMUSL)/src/unistd/tcsetpgrp.c
+#LIBMUSL_SRCS-y += $(LIBMUSL)/src/unistd/tcgetpgrp.c
+#LIBMUSL_SRCS-y += $(LIBMUSL)/src/unistd/tcsetpgrp.c
 #LIBMUSL_SRCS-y += $(LIBMUSL)/src/unistd/truncate.c
 LIBMUSL_SRCS-y += $(LIBMUSL)/src/unistd/ttyname.c
 LIBMUSL_SRCS-y += $(LIBMUSL)/src/unistd/ttyname_r.c
-- 
2.11.0


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