overby.me / darling-nix
this repo has no description
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Integrate libC++ into the includes list Build SmartCardServices

Andrew Hyatt e79f66ac ff49695c

+32 -14
+3
.gitmodules
··· 248 248 [submodule "src/external/remote_cmds"] 249 249 path = src/external/remote_cmds 250 250 url = ../darling-remote_cmds.git 251 + [submodule "src/external/SmartCardServices"] 252 + path = src/external/SmartCardServices 253 + url = ../darling-SmartCardServices.git
+17 -12
src/CMakeLists.txt
··· 59 59 add_definitions(-target x86_64-apple-darwin11) 60 60 include(darling_lib) 61 61 62 - include_directories("${CMAKE_CURRENT_SOURCE_DIR}/libc/include") 63 - include_directories("${CMAKE_CURRENT_SOURCE_DIR}/libm/Source") 64 - include_directories("${CMAKE_CURRENT_SOURCE_DIR}/kernel/libsyscall/wrappers") 65 - include_directories("${CMAKE_SOURCE_DIR}/platform-include") 66 - include_directories("${CMAKE_SOURCE_DIR}/platform-include/pthread") 67 - include_directories("${CMAKE_SOURCE_DIR}/kernel-include") 68 - include_directories("${CMAKE_CURRENT_SOURCE_DIR}/duct/include") 69 - include_directories("${CMAKE_CURRENT_SOURCE_DIR}/external/libplatform/include") 70 - 71 - include_directories("${CMAKE_CURRENT_SOURCE_DIR}/libc/derived") 62 + include_directories( 63 + ${CMAKE_CURRENT_SOURCE_DIR}/libc/include 64 + ${CMAKE_CURRENT_SOURCE_DIR}/external/libplatform/include 65 + ${CMAKE_SOURCE_DIR}/platform-include 66 + ${CMAKE_SOURCE_DIR}/platform-include/pthread 67 + ${CMAKE_CURRENT_SOURCE_DIR}/libc/derived 68 + ${CMAKE_CURRENT_SOURCE_DIR}/libc/include/NetBSD 69 + ${CMAKE_CURRENT_SOURCE_DIR}/kernel/libsyscall/wrappers 70 + ${CMAKE_SOURCE_DIR}/kernel-include 71 + ${CMAKE_CURRENT_SOURCE_DIR}/duct/include 72 + ${CMAKE_CURRENT_SOURCE_DIR}/external/libcxx/include 73 + ${CMAKE_CURRENT_SOURCE_DIR}/libm/Source 74 + ${CMAKE_CURRENT_SOURCE_DIR}/libc/second-include 75 + ) 72 76 73 - include_directories( 77 + include_directories(AFTER 78 + ${CMAKE_CURRENT_SOURCE_DIR}/external/SmartCardServices/include 74 79 ${CMAKE_CURRENT_SOURCE_DIR}/external/IOKitUser/include 75 80 ${CMAKE_CURRENT_SOURCE_DIR}/launchd/liblaunch/include 76 81 ${CMAKE_CURRENT_SOURCE_DIR}/sandbox/include ··· 88 93 ${CMAKE_CURRENT_SOURCE_DIR}/SystemConfiguration/include 89 94 ${CMAKE_CURRENT_SOURCE_DIR}/libiconv/include 90 95 ${CMAKE_CURRENT_SOURCE_DIR}/ncurses/include 91 - ${CMAKE_CURRENT_SOURCE_DIR}/libc/include/NetBSD 92 96 ${CMAKE_CURRENT_SOURCE_DIR}/external/corefoundation/include 93 97 ${CMAKE_CURRENT_SOURCE_DIR}/external/foundation/include 94 98 ${CMAKE_CURRENT_SOURCE_DIR}/external/syslog/libsystem_asl.tproj/include ··· 158 162 add_subdirectory(AppleSystemInfo) 159 163 add_subdirectory(CryptoTokenKit) 160 164 add_subdirectory(LocalAuthentication) 165 + add_subdirectory(external/SmartCardServices) 161 166 add_subdirectory(xar) 162 167 add_subdirectory(libedit) 163 168 add_subdirectory(external/libclosure)
+2
src/libc/CMakeLists.txt
··· 41 41 include_directories("${CMAKE_CURRENT_SOURCE_DIR}/../external/libdispatch/private") 42 42 include_directories("${CMAKE_SOURCE_DIR}/src/kernel/libsyscall/wrappers") 43 43 44 + include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/include) 45 + 44 46 add_subdirectory(db) # produces libc-db 45 47 add_subdirectory(compat-43) # produces libc-compat 46 48 add_subdirectory(emulated) # produces libc-emulated
+6
src/libc/second-include/README.md
··· 1 + #second-include 2 + `#include_next` and our `CMake` setup don't play nice together 3 + 4 + This is specifically for `stddef.h` 5 + 6 + Yes, this is necessary
+1
src/libc/second-include/math.h
··· 1 + ../../libm/Source/math.h
+1
src/libc/second-include/stddef.h
··· 1 + ../include/stddef.h
+2 -2
src/libstdcxx/CMakeLists.txt
··· 7 7 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D__DARWIN_UNIX03 -fPIC -w -include ${CMAKE_CURRENT_SOURCE_DIR}/build.h") 8 8 set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -nostdlib") 9 9 10 - include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include/c++/4.2.1) 11 - include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include/c++/4.2.1/backward) 10 + include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/include/c++/4.2.1) 11 + include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/include/c++/4.2.1/backward) 12 12 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../kernel-include) 13 13 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../libc/locale) 14 14 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../libc/locale/FreeBSD)