|
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [Minios-devel] [UNIKRAFT/MUSL PATCH 08/19] Update Makefiles to avoid multiple definitions during linking
wip: This commit leaves out all internal functions that are redefined with libvfscore in order to avoid linking errors. Signed-off-by: Gaulthier Gain <gaulthier.gain@xxxxxxxxx> --- Makefile.uk.musl.dirent | 18 +++++++------- Makefile.uk.musl.fcntl | 8 +++--- Makefile.uk.musl.legacy | 2 +- Makefile.uk.musl.linux | 8 +++--- Makefile.uk.musl.stat | 22 ++++++++--------- Makefile.uk.musl.stdio | 2 +- Makefile.uk.musl.unistd | 66 ++++++++++++++++++++++++------------------------- 7 files changed, 63 insertions(+), 63 deletions(-) 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 diff --git a/Makefile.uk.musl.fcntl b/Makefile.uk.musl.fcntl index 317174a..4dfb615 100644 --- a/Makefile.uk.musl.fcntl +++ b/Makefile.uk.musl.fcntl @@ -1,6 +1,6 @@ -LIBMUSL_SRCS-y += $(LIBMUSL)/src/fcntl/creat.c -LIBMUSL_SRCS-y += $(LIBMUSL)/src/fcntl/fcntl.c -LIBMUSL_SRCS-y += $(LIBMUSL)/src/fcntl/open.c -LIBMUSL_SRCS-y += $(LIBMUSL)/src/fcntl/openat.c +#LIBMUSL_SRCS-y += $(LIBMUSL)/src/fcntl/creat.c +#LIBMUSL_SRCS-y += $(LIBMUSL)/src/fcntl/fcntl.c +#LIBMUSL_SRCS-y += $(LIBMUSL)/src/fcntl/open.c +#LIBMUSL_SRCS-y += $(LIBMUSL)/src/fcntl/openat.c LIBMUSL_SRCS-y += $(LIBMUSL)/src/fcntl/posix_fadvise.c LIBMUSL_SRCS-y += $(LIBMUSL)/src/fcntl/posix_fallocate.c diff --git a/Makefile.uk.musl.legacy b/Makefile.uk.musl.legacy index a8626fd..1dbd3d3 100644 --- a/Makefile.uk.musl.legacy +++ b/Makefile.uk.musl.legacy @@ -1,7 +1,7 @@ LIBMUSL_SRCS-y += $(LIBMUSL)/src/legacy/cuserid.c LIBMUSL_SRCS-y += $(LIBMUSL)/src/legacy/daemon.c LIBMUSL_SRCS-y += $(LIBMUSL)/src/legacy/err.c -LIBMUSL_SRCS-y += $(LIBMUSL)/src/legacy/euidaccess.c +#LIBMUSL_SRCS-y += $(LIBMUSL)/src/legacy/euidaccess.c LIBMUSL_SRCS-y += $(LIBMUSL)/src/legacy/ftw.c LIBMUSL_SRCS-y += $(LIBMUSL)/src/legacy/futimes.c LIBMUSL_SRCS-y += $(LIBMUSL)/src/legacy/getdtablesize.c diff --git a/Makefile.uk.musl.linux b/Makefile.uk.musl.linux index 604e5dc..cf23d9a 100644 --- a/Makefile.uk.musl.linux +++ b/Makefile.uk.musl.linux @@ -4,20 +4,20 @@ LIBMUSL_SRCS-y += $(LIBMUSL)/src/linux/arch_prctl.c LIBMUSL_SRCS-y += $(LIBMUSL)/src/linux/brk.c LIBMUSL_SRCS-y += $(LIBMUSL)/src/linux/cache.c LIBMUSL_SRCS-y += $(LIBMUSL)/src/linux/cap.c -LIBMUSL_SRCS-y += $(LIBMUSL)/src/linux/chroot.c +#LIBMUSL_SRCS-y += $(LIBMUSL)/src/linux/chroot.c LIBMUSL_SRCS-y += $(LIBMUSL)/src/linux/clock_adjtime.c LIBMUSL_SRCS-y += $(LIBMUSL)/src/linux/clone.c|linux LIBMUSL_SRCS-y += $(LIBMUSL)/src/linux/epoll.c LIBMUSL_SRCS-y += $(LIBMUSL)/src/linux/eventfd.c -LIBMUSL_SRCS-y += $(LIBMUSL)/src/linux/fallocate.c +#LIBMUSL_SRCS-y += $(LIBMUSL)/src/linux/fallocate.c LIBMUSL_SRCS-y += $(LIBMUSL)/src/linux/fanotify.c -LIBMUSL_SRCS-y += $(LIBMUSL)/src/linux/flock.c +#LIBMUSL_SRCS-y += $(LIBMUSL)/src/linux/flock.c LIBMUSL_SRCS-y += $(LIBMUSL)/src/linux/inotify.c LIBMUSL_SRCS-y += $(LIBMUSL)/src/linux/ioperm.c LIBMUSL_SRCS-y += $(LIBMUSL)/src/linux/iopl.c LIBMUSL_SRCS-y += $(LIBMUSL)/src/linux/klogctl.c LIBMUSL_SRCS-y += $(LIBMUSL)/src/linux/module.c -LIBMUSL_SRCS-y += $(LIBMUSL)/src/linux/mount.c +#LIBMUSL_SRCS-y += $(LIBMUSL)/src/linux/mount.c LIBMUSL_SRCS-y += $(LIBMUSL)/src/linux/personality.c LIBMUSL_SRCS-y += $(LIBMUSL)/src/linux/pivot_root.c LIBMUSL_SRCS-y += $(LIBMUSL)/src/linux/ppoll.c diff --git a/Makefile.uk.musl.stat b/Makefile.uk.musl.stat index 764bee4..e5888ed 100644 --- a/Makefile.uk.musl.stat +++ b/Makefile.uk.musl.stat @@ -1,20 +1,20 @@ -LIBMUSL_SRCS-y += $(LIBMUSL)/src/stat/__xstat.c -LIBMUSL_SRCS-y += $(LIBMUSL)/src/stat/chmod.c -LIBMUSL_SRCS-y += $(LIBMUSL)/src/stat/fchmod.c +# LIBMUSL_SRCS-y += $(LIBMUSL)/src/stat/__xstat.c +# LIBMUSL_SRCS-y += $(LIBMUSL)/src/stat/chmod.c +# LIBMUSL_SRCS-y += $(LIBMUSL)/src/stat/fchmod.c LIBMUSL_SRCS-y += $(LIBMUSL)/src/stat/fchmodat.c -LIBMUSL_SRCS-y += $(LIBMUSL)/src/stat/fstat.c -LIBMUSL_SRCS-y += $(LIBMUSL)/src/stat/fstatat.c +# LIBMUSL_SRCS-y += $(LIBMUSL)/src/stat/fstat.c +# LIBMUSL_SRCS-y += $(LIBMUSL)/src/stat/fstatat.c LIBMUSL_SRCS-y += $(LIBMUSL)/src/stat/futimens.c LIBMUSL_SRCS-y += $(LIBMUSL)/src/stat/futimesat.c LIBMUSL_SRCS-y += $(LIBMUSL)/src/stat/lchmod.c -LIBMUSL_SRCS-y += $(LIBMUSL)/src/stat/lstat.c -LIBMUSL_SRCS-y += $(LIBMUSL)/src/stat/mkdir.c +# LIBMUSL_SRCS-y += $(LIBMUSL)/src/stat/lstat.c +# LIBMUSL_SRCS-y += $(LIBMUSL)/src/stat/mkdir.c LIBMUSL_SRCS-y += $(LIBMUSL)/src/stat/mkdirat.c LIBMUSL_SRCS-y += $(LIBMUSL)/src/stat/mkfifo.c LIBMUSL_SRCS-y += $(LIBMUSL)/src/stat/mkfifoat.c -LIBMUSL_SRCS-y += $(LIBMUSL)/src/stat/mknod.c +# LIBMUSL_SRCS-y += $(LIBMUSL)/src/stat/mknod.c LIBMUSL_SRCS-y += $(LIBMUSL)/src/stat/mknodat.c -LIBMUSL_SRCS-y += $(LIBMUSL)/src/stat/stat.c -LIBMUSL_SRCS-y += $(LIBMUSL)/src/stat/statvfs.c -LIBMUSL_SRCS-y += $(LIBMUSL)/src/stat/umask.c +# LIBMUSL_SRCS-y += $(LIBMUSL)/src/stat/stat.c +# LIBMUSL_SRCS-y += $(LIBMUSL)/src/stat/statvfs.c +# LIBMUSL_SRCS-y += $(LIBMUSL)/src/stat/umask.c LIBMUSL_SRCS-y += $(LIBMUSL)/src/stat/utimensat.c diff --git a/Makefile.uk.musl.stdio b/Makefile.uk.musl.stdio index 8b3840a..b27f722 100644 --- a/Makefile.uk.musl.stdio +++ b/Makefile.uk.musl.stdio @@ -78,7 +78,7 @@ LIBMUSL_SRCS-y += $(LIBMUSL)/src/stdio/putw.c LIBMUSL_SRCS-y += $(LIBMUSL)/src/stdio/putwc.c LIBMUSL_SRCS-y += $(LIBMUSL)/src/stdio/putwchar.c LIBMUSL_SRCS-y += $(LIBMUSL)/src/stdio/remove.c -LIBMUSL_SRCS-y += $(LIBMUSL)/src/stdio/rename.c +#LIBMUSL_SRCS-y += $(LIBMUSL)/src/stdio/rename.c LIBMUSL_SRCS-y += $(LIBMUSL)/src/stdio/rewind.c LIBMUSL_SRCS-y += $(LIBMUSL)/src/stdio/scanf.c LIBMUSL_SRCS-y += $(LIBMUSL)/src/stdio/setbuf.c diff --git a/Makefile.uk.musl.unistd b/Makefile.uk.musl.unistd index 4e483ab..4a76eeb 100644 --- a/Makefile.uk.musl.unistd +++ b/Makefile.uk.musl.unistd @@ -1,26 +1,26 @@ LIBMUSL_SRCS-y += $(LIBMUSL)/src/unistd/_exit.c -LIBMUSL_SRCS-y += $(LIBMUSL)/src/unistd/access.c +#LIBMUSL_SRCS-y += $(LIBMUSL)/src/unistd/access.c LIBMUSL_SRCS-y += $(LIBMUSL)/src/unistd/acct.c LIBMUSL_SRCS-y += $(LIBMUSL)/src/unistd/alarm.c -LIBMUSL_SRCS-y += $(LIBMUSL)/src/unistd/chdir.c -LIBMUSL_SRCS-y += $(LIBMUSL)/src/unistd/chown.c +#LIBMUSL_SRCS-y += $(LIBMUSL)/src/unistd/chdir.c +#LIBMUSL_SRCS-y += $(LIBMUSL)/src/unistd/chown.c #LIBMUSL_SRCS-y += $(LIBMUSL)/src/unistd/close.c LIBMUSL_SRCS-y += $(LIBMUSL)/src/unistd/ctermid.c -LIBMUSL_SRCS-y += $(LIBMUSL)/src/unistd/dup.c -LIBMUSL_SRCS-y += $(LIBMUSL)/src/unistd/dup2.c +#LIBMUSL_SRCS-y += $(LIBMUSL)/src/unistd/dup.c +#LIBMUSL_SRCS-y += $(LIBMUSL)/src/unistd/dup2.c LIBMUSL_SRCS-y += $(LIBMUSL)/src/unistd/dup3.c -LIBMUSL_SRCS-y += $(LIBMUSL)/src/unistd/faccessat.c -LIBMUSL_SRCS-y += $(LIBMUSL)/src/unistd/fchdir.c -LIBMUSL_SRCS-y += $(LIBMUSL)/src/unistd/fchown.c +#LIBMUSL_SRCS-y += $(LIBMUSL)/src/unistd/faccessat.c +#LIBMUSL_SRCS-y += $(LIBMUSL)/src/unistd/fchdir.c +#LIBMUSL_SRCS-y += $(LIBMUSL)/src/unistd/fchown.c LIBMUSL_SRCS-y += $(LIBMUSL)/src/unistd/fchownat.c -LIBMUSL_SRCS-y += $(LIBMUSL)/src/unistd/fdatasync.c -LIBMUSL_SRCS-y += $(LIBMUSL)/src/unistd/fsync.c -LIBMUSL_SRCS-y += $(LIBMUSL)/src/unistd/ftruncate.c -LIBMUSL_SRCS-y += $(LIBMUSL)/src/unistd/getcwd.c +#LIBMUSL_SRCS-y += $(LIBMUSL)/src/unistd/fdatasync.c +#LIBMUSL_SRCS-y += $(LIBMUSL)/src/unistd/fsync.c +#LIBMUSL_SRCS-y += $(LIBMUSL)/src/unistd/ftruncate.c +#LIBMUSL_SRCS-y += $(LIBMUSL)/src/unistd/getcwd.c LIBMUSL_SRCS-y += $(LIBMUSL)/src/unistd/getegid.c LIBMUSL_SRCS-y += $(LIBMUSL)/src/unistd/geteuid.c LIBMUSL_SRCS-y += $(LIBMUSL)/src/unistd/getgid.c -LIBMUSL_SRCS-y += $(LIBMUSL)/src/unistd/getgroups.c +#LIBMUSL_SRCS-y += $(LIBMUSL)/src/unistd/getgroups.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 @@ -31,52 +31,52 @@ 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/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/lseek.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/pipe.c LIBMUSL_SRCS-y += $(LIBMUSL)/src/unistd/pipe2.c LIBMUSL_SRCS-y += $(LIBMUSL)/src/unistd/posix_close.c -LIBMUSL_SRCS-y += $(LIBMUSL)/src/unistd/pread.c -LIBMUSL_SRCS-y += $(LIBMUSL)/src/unistd/preadv.c -LIBMUSL_SRCS-y += $(LIBMUSL)/src/unistd/pwrite.c -LIBMUSL_SRCS-y += $(LIBMUSL)/src/unistd/pwritev.c +#LIBMUSL_SRCS-y += $(LIBMUSL)/src/unistd/pread.c +#LIBMUSL_SRCS-y += $(LIBMUSL)/src/unistd/preadv.c +#LIBMUSL_SRCS-y += $(LIBMUSL)/src/unistd/pwrite.c +#LIBMUSL_SRCS-y += $(LIBMUSL)/src/unistd/pwritev.c #LIBMUSL_SRCS-y += $(LIBMUSL)/src/unistd/read.c -LIBMUSL_SRCS-y += $(LIBMUSL)/src/unistd/readlink.c +#LIBMUSL_SRCS-y += $(LIBMUSL)/src/unistd/readlink.c LIBMUSL_SRCS-y += $(LIBMUSL)/src/unistd/readlinkat.c -LIBMUSL_SRCS-y += $(LIBMUSL)/src/unistd/readv.c +#LIBMUSL_SRCS-y += $(LIBMUSL)/src/unistd/readv.c LIBMUSL_SRCS-y += $(LIBMUSL)/src/unistd/renameat.c -LIBMUSL_SRCS-y += $(LIBMUSL)/src/unistd/rmdir.c +#LIBMUSL_SRCS-y += $(LIBMUSL)/src/unistd/rmdir.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/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/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/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/symlink.c LIBMUSL_SRCS-y += $(LIBMUSL)/src/unistd/symlinkat.c -LIBMUSL_SRCS-y += $(LIBMUSL)/src/unistd/sync.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/truncate.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 LIBMUSL_SRCS-y += $(LIBMUSL)/src/unistd/ualarm.c -LIBMUSL_SRCS-y += $(LIBMUSL)/src/unistd/unlink.c +#LIBMUSL_SRCS-y += $(LIBMUSL)/src/unistd/unlink.c LIBMUSL_SRCS-y += $(LIBMUSL)/src/unistd/unlinkat.c LIBMUSL_SRCS-y += $(LIBMUSL)/src/unistd/usleep.c #LIBMUSL_SRCS-y += $(LIBMUSL)/src/unistd/write.c -LIBMUSL_SRCS-y += $(LIBMUSL)/src/unistd/writev.c +#LIBMUSL_SRCS-y += $(LIBMUSL)/src/unistd/writev.c #LIBMUSL_SRCS-y += $(LIBMUSL)/src/unistd/mips/pipe.s #LIBMUSL_SRCS-y += $(LIBMUSL)/src/unistd/mips64/pipe.s -- 2.11.0 _______________________________________________ Minios-devel mailing list Minios-devel@xxxxxxxxxxxxxxxxxxxx https://lists.xenproject.org/mailman/listinfo/minios-devel
|
 |
Lists.xenproject.org is hosted with RackSpace, monitoring our |