From: Gaulthier Gain <gaulthier.gain@uliege.be>
Date: Wed, 29 Jan 2020 21:18:37 +0000 (+0100)
Subject: Avoid multiple definitions by excluding functions related to dirent
X-Git-Tag: RELEASE-0.4~14
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=f1b94971045da4dc8aee69a4329aab229f6ec43f;p=unikraft%2Flibs%2Fmusl.git

Avoid multiple definitions by excluding functions related to dirent

Signed-off-by: Gaulthier Gain <gaulthier.gain@uliege.be>
Reviewed-by: Simon Kuenzer <simon.kuenzer@neclab.eu>
---

diff --git a/Makefile.uk.musl.dirent b/Makefile.uk.musl.dirent
index 93f4bfa..3bb54a3 100644
--- a/Makefile.uk.musl.dirent
+++ b/Makefile.uk.musl.dirent
@@ -1,13 +1,13 @@
 LIBMUSL_SRCS-y += $(LIBMUSL)/src/dirent/__getdents.c
 LIBMUSL_SRCS-y += $(LIBMUSL)/src/dirent/alphasort.c
-LIBMUSL_SRCS-y += $(LIBMUSL)/src/dirent/closedir.c
-LIBMUSL_SRCS-y += $(LIBMUSL)/src/dirent/dirfd.c
-LIBMUSL_SRCS-y += $(LIBMUSL)/src/dirent/fdopendir.c
-LIBMUSL_SRCS-y += $(LIBMUSL)/src/dirent/opendir.c
-LIBMUSL_SRCS-y += $(LIBMUSL)/src/dirent/readdir.c
-LIBMUSL_SRCS-y += $(LIBMUSL)/src/dirent/readdir_r.c
-LIBMUSL_SRCS-y += $(LIBMUSL)/src/dirent/rewinddir.c
+#LIBMUSL_SRCS-y += $(LIBMUSL)/src/dirent/closedir.c
+#LIBMUSL_SRCS-y += $(LIBMUSL)/src/dirent/dirfd.c
+#LIBMUSL_SRCS-y += $(LIBMUSL)/src/dirent/fdopendir.c
+#LIBMUSL_SRCS-y += $(LIBMUSL)/src/dirent/opendir.c
+#LIBMUSL_SRCS-y += $(LIBMUSL)/src/dirent/readdir.c
+#LIBMUSL_SRCS-y += $(LIBMUSL)/src/dirent/readdir_r.c
+#LIBMUSL_SRCS-y += $(LIBMUSL)/src/dirent/rewinddir.c
 LIBMUSL_SRCS-y += $(LIBMUSL)/src/dirent/scandir.c
-LIBMUSL_SRCS-y += $(LIBMUSL)/src/dirent/seekdir.c
-LIBMUSL_SRCS-y += $(LIBMUSL)/src/dirent/telldir.c
+#LIBMUSL_SRCS-y += $(LIBMUSL)/src/dirent/seekdir.c
+#LIBMUSL_SRCS-y += $(LIBMUSL)/src/dirent/telldir.c
 LIBMUSL_SRCS-y += $(LIBMUSL)/src/dirent/versionsort.c