darlinghq/darling-xnu
1
0
Fork 0
mirror of https://github.com/darlinghq/darling-xnu.git synced 2024-11-26 22:10:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[libsystem_kernel] Fix Building

Browse Source
This commit is contained in:
Thomas A 2023-05-17 10:14:41 -07:00
parent c128ce938e
commit 25966d69aa
12 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
darling/src/libsystem_kernel/emulation/linux/CMakeLists.txt
View File

@ -19,7 +19,7 @@ add_definitions(-DBSDTHREAD_WRAP_LINUX_PTHREAD
# include src/startup for rtsig.h
include_directories(${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_BINARY_DIR}/src/startup
${CMAKE_BINARY_DIR}/src/kernel/libsyscall
${CMAKE_BINARY_DIR}/src/external/xnu/darling/src/libsystem_kernel/libsyscall
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_BINARY_DIR}/src/external/darlingserver/include
${CMAKE_SOURCE_DIR}/src/external/darlingserver/include
@ -319,7 +319,7 @@ set_source_files_properties(${CMAKE_BINARY_DIR}/src/external/darlingserver/src/r
)
include_directories(
../../../libsimple/include
${CMAKE_SOURCE_DIR}/src/libsimple/include
)
add_darling_object_library(emulation ${emulation_sources})

2
darling/src/libsystem_kernel/emulation/linux/bsdthread/workq_kernreturn.c
View File

@ -19,7 +19,7 @@
#include <pthread/priority_private.h>
// much easier to include than libpthread's `internal.h`
#include "../../../../startup/mldr/elfcalls/dthreads.h"
#include "../../../../../../../../startup/mldr/elfcalls/dthreads.h"
#include <darlingserver/rpc.h>
#include "../guarded/table.h"

2
darling/src/libsystem_kernel/emulation/linux/fcntl/open.c
View File

@ -4,7 +4,7 @@
#include "../errno.h"
#include <linux-syscalls/linux.h>
//#include "../../../../platform-include/sys/fcntl.h"
#include "../../../../external/libc/include/fcntl.h"
#include <sys/fcntl.h>
#include "../bsdthread/per_thread_wd.h"
#include "../bsdthread/cancelable.h"

2
darling/src/libsystem_kernel/emulation/linux/fcntl/openat.c
View File

@ -3,7 +3,7 @@
#include "../base.h"
#include "../errno.h"
#include <linux-syscalls/linux.h>
#include "../../../../external/libc/include/fcntl.h"
#include <sys/fcntl.h>
#include "../common_at.h"
#include "../simple.h"
#include "../vchroot_expand.h"

2
darling/src/libsystem_kernel/emulation/linux/mach/CMakeLists.txt
View File

@ -5,7 +5,7 @@ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99")
add_definitions(-nostdinc)
include_directories(
${CMAKE_SOURCE_DIR}/src/kernel/emulation/linux/ext
${CMAKE_SOURCE_DIR}/src/external/xnu/darling/src/libsystem_kernel/emulation/linux/ext
${CMAKE_SOURCE_DIR}/src/startup
${CMAKE_BINARY_DIR}/src/startup
${CMAKE_BINARY_DIR}/src/external/darlingserver/include

2
darling/src/libsystem_kernel/emulation/linux/misc/gethostuuid.c
View File

@ -2,7 +2,7 @@
#include "../base.h"
#include "../errno.h"
#include <linux-syscalls/linux.h>
#include "../../../../external/libc/include/fcntl.h"
#include <sys/fcntl.h>
#include <sys/errno.h>
#include "../fcntl/open.h"
#include "../unistd/close.h"

2
darling/src/libsystem_kernel/emulation/linux/signal/exc.defs
View File

@ -1 +1 @@
../../../../../Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include/mach/exc.defs
../../../../../../osfmk/mach/exc.defs

2
darling/src/libsystem_kernel/emulation/linux/signal/mach_exc.defs
View File

@ -1 +1 @@
../../../../../Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include/mach/mach_exc.defs
../../../../../../osfmk/mach/mach_exc.defs

2
darling/src/libsystem_kernel/emulation/linux/stat/fstatfs.c
View File

@ -3,13 +3,13 @@
#include "../base.h"
#include "../errno.h"
#include "../simple.h"
#include "../../../../external/libc/include/fcntl.h"
#include "../fcntl/open.h"
#include "../unistd/close.h"
#include "../unistd/readlink.h"
#include "../fdpath.h"
#include <linux-syscalls/linux.h>
#include <stddef.h>
#include <sys/fcntl.h>
extern char *strtok_r(char *str, const char *delim, char **saveptr);
extern __SIZE_TYPE__ strlcpy(char* dst, const char* src, __SIZE_TYPE__ size);

2
darling/src/libsystem_kernel/emulation/linux/stat/getfsstat.c
View File

@ -3,11 +3,11 @@
#include "../base.h"
#include "../errno.h"
#include "../simple.h"
#include "../../../../external/libc/include/fcntl.h"
#include "../fcntl/open.h"
#include "../unistd/close.h"
#include <linux-syscalls/linux.h>
#include <stddef.h>
#include <sys/fcntl.h>
extern char *strtok_r(char *str, const char *delim, char **saveptr);
extern unsigned long strlcpy(char* dst, const char* src, unsigned long size);

2
darling/src/libsystem_kernel/emulation/linux/stat/statfs.c
View File

@ -3,13 +3,13 @@
#include "../base.h"
#include "../errno.h"
#include "../simple.h"
#include "../../../../external/libc/include/fcntl.h"
#include "../fcntl/open.h"
#include "../unistd/close.h"
#include "../vchroot_expand.h"
#include "../bsdthread/per_thread_wd.h"
#include <linux-syscalls/linux.h>
#include <stddef.h>
#include <sys/fcntl.h>
#undef strlcpy

8
libsyscall/CMakeLists.txt
View File

@ -18,7 +18,7 @@ add_definitions(-DPRIVATE=1 -D__DARWIN_C_LEVEL=20150101)
add_definitions('-D__XNU_PRIVATE_EXTERN=')
add_definitions(-DIOKIT_ALL_IPC=1 -DIOKIT=1)
include_directories(${CMAKE_SOURCE_DIR}/src/external/darlingserver/duct-tape/xnu/osfmk)
include_directories(../osfmk)
include_directories(
"${CMAKE_BINARY_DIR}/src/external/darlingserver/include"
@ -73,7 +73,7 @@ list(APPEND syscall_mig_headers "${CMAKE_CURRENT_BINARY_DIR}/mach/servers/netnam
file(MAKE_DIRECTORY "${CMAKE_BINARY_DIR}/${DARLING_SDK_RELATIVE_PATH}/usr/include/servers")
create_symlink(
"${DARLING_ROOT_RELATIVE_TO_SDK}/../../../src/kernel/libsyscall/mach/servers/netname.h"
"${DARLING_ROOT_RELATIVE_TO_SDK}/../../../src/external/xnu/darling/src/libsystem_kernel/libsyscall/mach/servers/netname.h"
"${CMAKE_BINARY_DIR}/${DARLING_SDK_RELATIVE_PATH}/usr/include/servers/netname.h"
)
@ -95,7 +95,7 @@ foreach(MIG_FILENAME IN LISTS LIBSYSCALL_MIGS)
file(MAKE_DIRECTORY "${CMAKE_BINARY_DIR}/${DARLING_SDK_RELATIVE_PATH}/usr/include/${MIG_HEADER_DIR}")
create_symlink(
"${DARLING_ROOT_RELATIVE_TO_SDK}/../../../src/kernel/libsyscall/${MIG_FILENAME}.h"
"${DARLING_ROOT_RELATIVE_TO_SDK}/../../../src/external/xnu/darling/src/libsystem_kernel/libsyscall/${MIG_FILENAME}.h"
"${CMAKE_BINARY_DIR}/${DARLING_SDK_RELATIVE_PATH}/usr/include/${MIG_FILENAME}.h"
)
endforeach()
@ -118,7 +118,7 @@ foreach(MIG_FILENAME IN LISTS LIBSYSCALL_MIGS_INTERNAL)
file(MAKE_DIRECTORY "${CMAKE_BINARY_DIR}/${DARLING_SDK_RELATIVE_PATH}/usr/include/${MIG_HEADER_DIR}")
create_symlink(
"${DARLING_ROOT_RELATIVE_TO_SDK}/../../../src/kernel/libsyscall/${MIG_FILENAME}_internal.h"
"${DARLING_ROOT_RELATIVE_TO_SDK}/../../../src/external/xnu/darling/src/libsystem_kernel/libsyscall/${MIG_FILENAME}_internal.h"
"${CMAKE_BINARY_DIR}/${DARLING_SDK_RELATIVE_PATH}/usr/include/${MIG_FILENAME}_internal.h"
)
endforeach()