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.

Build libarchive and CommonCrypto as Mach-O

Lubos Dolezel be246799 0f5022c5

+19 -23
+1
cmake/use_ld64.cmake
··· 21 21 -Wl,-dylib_file,/usr/lib/system/libmacho.dylib:${CMAKE_BINARY_DIR}/src/libmacho/libmacho.dylib \ 22 22 -Wl,-dylib_file,/usr/lib/system/libsystem_sandbox.dylib:${CMAKE_BINARY_DIR}/src/sandbox/libsystem_sandbox.dylib \ 23 23 -Wl,-dylib_file,/usr/lib/system/libsystem_duct.dylib:${CMAKE_BINARY_DIR}/src/duct/src/libsystem_duct.dylib \ 24 + -Wl,-dylib_file,/usr/lib/libcommonCrypto.dylib:${CMAKE_BINARY_DIR}/src/CommonCrypto/libcommonCrypto.dylib \ 24 25 -Wl,-dylib_file,/usr/lib/system/libsystem_malloc.dylib:${CMAKE_BINARY_DIR}/src/libmalloc/libsystem_malloc.dylib ") 25 26 26 27 add_dependencies(${target} x86_64-apple-darwin11-ld)
+2 -2
src/CMakeLists.txt
··· 104 104 add_subdirectory(libedit) 105 105 add_subdirectory(external/compiler-rt/lib/BlocksRuntime) 106 106 add_subdirectory(external/compiler-rt/lib/builtins) 107 - #add_subdirectory(CommonCrypto) 107 + add_subdirectory(CommonCrypto) 108 108 add_subdirectory(csu) 109 109 #add_subdirectory(external/python/2.6/Python-2.6.9) 110 110 #add_subdirectory(external/python/2.7/Python-2.7.10) 111 111 #add_subdirectory(external/ruby) 112 112 add_subdirectory(external/expat) 113 113 add_subdirectory(external/libauto) 114 - #add_subdirectory(external/libarchive/libarchive) 114 + add_subdirectory(external/libarchive/libarchive) 115 115 add_subdirectory(external/apr) 116 116 #add_subdirectory(external/corecrypto) 117 117 #add_subdirectory(external/security) # work in progress
+8 -10
src/CommonCrypto/CMakeLists.txt
··· 8 8 9 9 10 10 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -nostdinc -D__DARWIN_UNIX03 -fPIC -fblocks -w") 11 - set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -nostdlib -Wl,--version-script=${DARLING_TOP_DIRECTORY}/darwin.map") 12 11 add_definitions(-D_APPLE_COMMON_CRYPTO_) 13 12 14 13 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/Source/API) ··· 33 32 Source/Digest/sha1.c 34 33 Source/Digest/sha1-586.S 35 34 Source/Digest/sha1-x86_64.S 36 - #Source/Digest/sha2.c 37 - #Source/Digest/sha256.S 35 + Source/Digest/sha2.c 36 + Source/Digest/sha256.S 38 37 #Source/Digest/sha1edpBigEndian.S 39 38 40 39 #Source/RC2/ccRC2.c ··· 61 60 #Source/API/CommonSymmetricKeywrap.c 62 61 Source/libtomcrypt/src/misc/base64/base64_decode.c 63 62 Source/libtomcrypt/src/misc/base64/base64_encode.c 63 + Source/libtomcrypt/src/misc/crypt/crypt_argchk.c 64 64 ) 65 65 66 - SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/darling") 67 - SET(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE) 68 - SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) 66 + set(DYLIB_INSTALL_NAME "/usr/lib/libcommonCrypto.dylib") 67 + add_darling_library(CommonCrypto SHARED ${cc_SRCS}) 68 + target_link_libraries(CommonCrypto system_c system_m system_dyld) 69 + set_target_properties(CommonCrypto PROPERTIES OUTPUT_NAME "commonCrypto") 69 70 70 - add_library(CommonCrypto SHARED ${cc_SRCS}) 71 - target_link_libraries(CommonCrypto system_c system_kernel) 72 - 73 - install(TARGETS CommonCrypto DESTINATION ${CMAKE_INSTALL_LIBDIR}/darling) 71 + install(TARGETS CommonCrypto DESTINATION libexec/darling/usr/lib)
+6 -10
src/CommonCrypto/Source/Digest/sha1-x86_64.S
··· 2 2 #ifdef __x86_64__ 3 3 4 4 .text 5 - .globl sha1_block_asm_data_order 6 - .type sha1_block_asm_data_order,@function 7 - .align 16 8 - sha1_block_asm_data_order: 5 + .globl _sha1_block_asm_data_order 6 + .align 4 7 + _sha1_block_asm_data_order: 9 8 pushq %rbx 10 9 pushq %rbp 11 10 pushq %r12 ··· 1281 1280 popq %rbp 1282 1281 popq %rbx 1283 1282 .byte 0xf3,0xc3 1284 - .size sha1_block_asm_data_order,.-sha1_block_asm_data_order 1285 - .globl sha1_block_asm_host_order 1286 - .type sha1_block_asm_host_order,@function 1287 - .align 16 1288 - sha1_block_asm_host_order: 1283 + .globl _sha1_block_asm_host_order 1284 + .align 4 1285 + _sha1_block_asm_host_order: 1289 1286 pushq %rbx 1290 1287 pushq %rbp 1291 1288 pushq %r12 ··· 1501 1498 roll $30,%r12d 1502 1499 addl %ebx,%ebp 1503 1500 jmp .Lshortcut 1504 - .size sha1_block_asm_host_order,.-sha1_block_asm_host_order 1505 1501 1506 1502 #endif
+2 -1
src/libsystem/CMakeLists.txt
··· 38 38 add_darling_library(system SHARED ${libsystem_sources}) 39 39 target_link_libraries(system PRIVATE system_malloc system_c system_kernel keymgr sandbox 40 40 system_m system_info system_notify system_quarantine libdispatch_shared launch compiler_rt 41 - removefile system_copyfile unwind system_coreservices system_dyld macho) # objc CommonCrypto 41 + removefile system_copyfile unwind system_coreservices system_dyld macho CommonCrypto) # objc 42 42 set_target_properties(system PROPERTIES OUTPUT_NAME "System.B") 43 43 set_property(TARGET system APPEND_STRING PROPERTY LINK_FLAGS 44 44 " -sub_library libsystem_malloc \ ··· 59 59 -sub_library libdyld \ 60 60 -sub_library libcompiler_rt \ 61 61 -sub_library libmacho \ 62 + -sub_library libcommonCrypto \ 62 63 -sub_library libsystem_sandbox \ 63 64 -sub_library libsystem_coreservices \ 64 65 -Wl,-dylib_compatibility_version,1238.0.0")