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.

Fix build issue caused by reorganization

Only occured on clean builds

Andrew Hyatt b70ac4c3 0a2710bf

+35 -55
+23 -23
cmake/use_ld64.cmake
··· 51 51 -Wl,-dylib_file,/usr/lib/libsqlite3.0.dylib:${CMAKE_BINARY_DIR}/src/external/sqlite/libsqlite3.0.dylib \ 52 52 -Wl,-dylib_file,/System/Library/Frameworks/CryptoTokenKit.framework/Versions/A/CryptoTokenKit:${CMAKE_BINARY_DIR}/src/CryptoTokenKit/CryptoTokenKit \ 53 53 -Wl,-dylib_file,/System/Library/Frameworks/IOKit.framework/Versions/A/IOKit:${CMAKE_BINARY_DIR}/src/external/IOKitUser/IOKit \ 54 - -Wl,-dylib_file,/System/Library/Frameworks/SystemConfiguration.framework/Versions/A/SystemConfiguration:${CMAKE_BINARY_DIR}/src/SystemConfiguration/SystemConfiguration \ 54 + -Wl,-dylib_file,/System/Library/Frameworks/SystemConfiguration.framework/Versions/A/SystemConfiguration:${CMAKE_BINARY_DIR}/src/private-frameworks/SystemConfiguration/SystemConfiguration \ 55 55 -Wl,-dylib_file,/usr/lib/libbz2.1.0.dylib:${CMAKE_BINARY_DIR}/src/external/bzip2/libbz2.1.0.dylib \ 56 56 -Wl,-dylib_file,/usr/lib/libssl.0.9.8.dylib:${CMAKE_BINARY_DIR}/src/external/openssl/src/libssl.0.9.8.dylib \ 57 57 -Wl,-dylib_file,/usr/lib/libcrypto.0.9.8.dylib:${CMAKE_BINARY_DIR}/src/external/openssl/src/libcrypto.0.9.8.dylib \ 58 58 -Wl,-dylib_file,/usr/lib/native/libGL.dylib:${CMAKE_BINARY_DIR}/src/native/libGL.dylib \ 59 - -Wl,-dylib_file,/System/Library/Frameworks/CoreImage.framework/Versions/A/CoreImage:${CMAKE_BINARY_DIR}/src/CoreImage/CoreImage \ 60 - -Wl,-dylib_file,/System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/FSEvents.framework/Versions/A/FSEvents:${CMAKE_BINARY_DIR}/src/CoreServices/FSEvents \ 61 - -Wl,-dylib_file,/System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/LaunchServices.framework/Versions/A/LaunchServices:${CMAKE_BINARY_DIR}/src/CoreServices/LaunchServices \ 59 + -Wl,-dylib_file,/System/Library/Frameworks/CoreImage.framework/Versions/A/CoreImage:${CMAKE_BINARY_DIR}/src/frameworks/CoreImage/CoreImage \ 60 + -Wl,-dylib_file,/System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/FSEvents.framework/Versions/A/FSEvents:${CMAKE_BINARY_DIR}/src/frameworks/CoreServices/FSEvents \ 61 + -Wl,-dylib_file,/System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/LaunchServices.framework/Versions/A/LaunchServices:${CMAKE_BINARY_DIR}/src/frameworks/CoreServices/LaunchServices \ 62 62 -Wl,-dylib_file,/System/Library/Frameworks/Accelerate.framework/Versions/A/Frameworks/vecLib.framework/Versions/A/libvMisc.dylib\ 63 - :${CMAKE_BINARY_DIR}/src/Accelerate/vecLib/vMisc/libvMisc.dylib \ 63 + :${CMAKE_BINARY_DIR}/src/frameworks/Accelerate/vecLib/vMisc/libvMisc.dylib \ 64 64 -Wl,-dylib_file,/System/Library/Frameworks/Accelerate.framework/Versions/A/Frameworks/vecLib.framework/Versions/A/libvDSP.dylib\ 65 - :${CMAKE_BINARY_DIR}/src/Accelerate/vecLib/vDSP/libvDSP.dylib \ 65 + :${CMAKE_BINARY_DIR}/src/frameworks/Accelerate/vecLib/vDSP/libvDSP.dylib \ 66 66 -Wl,-dylib_file,/System/Library/Frameworks/Accelerate.framework/Versions/A/Frameworks/vecLib.framework/Versions/A/libBLAS.dylib\ 67 - :${CMAKE_BINARY_DIR}/src/Accelerate/vecLib/BLAS/libBLAS.dylib \ 67 + :${CMAKE_BINARY_DIR}/src/frameworks/Accelerate/vecLib/BLAS/libBLAS.dylib \ 68 68 -Wl,-dylib_file,/System/Library/Frameworks/Accelerate.framework/Versions/A/Frameworks/vecLib.framework/Versions/A/libLAPACK.dylib\ 69 - :${CMAKE_BINARY_DIR}/src/Accelerate/vecLib/LAPACK/libLAPACK.dylib \ 69 + :${CMAKE_BINARY_DIR}/src/frameworks/Accelerate/vecLib/LAPACK/libLAPACK.dylib \ 70 70 -Wl,-dylib_file,/System/Library/Frameworks/Accelerate.framework/Versions/A/Frameworks/vecLib.framework/Versions/A/libLinearAlgebra.dylib\ 71 - :${CMAKE_BINARY_DIR}/src/Accelerate/vecLib/LinearAlgebra/libLinearAlgebra.dylib \ 71 + :${CMAKE_BINARY_DIR}/src/frameworks/Accelerate/vecLib/LinearAlgebra/libLinearAlgebra.dylib \ 72 72 -Wl,-dylib_file,/System/Library/Frameworks/Accelerate.framework/Versions/A/Frameworks/vecLib.framework/Versions/A/libSparseBLAS.dylib\ 73 - :${CMAKE_BINARY_DIR}/src/Accelerate/vecLib/SparseBLAS/libSparseBLAS.dylib \ 73 + :${CMAKE_BINARY_DIR}/src/frameworks/Accelerate/vecLib/SparseBLAS/libSparseBLAS.dylib \ 74 74 -Wl,-dylib_file,/System/Library/Frameworks/Accelerate.framework/Versions/A/Frameworks/vecLib.framework/Versions/A/libQuadrature.dylib\ 75 - :${CMAKE_BINARY_DIR}/src/Accelerate/vecLib/Quadrature/libQuadrature.dylib \ 75 + :${CMAKE_BINARY_DIR}/src/frameworks/Accelerate/vecLib/Quadrature/libQuadrature.dylib \ 76 76 -Wl,-dylib_file,/System/Library/Frameworks/Accelerate.framework/Versions/A/Frameworks/vecLib.framework/Versions/A/libBNNS.dylib\ 77 - :${CMAKE_BINARY_DIR}/src/Accelerate/vecLib/BNNS/libBNNS.dylib \ 77 + :${CMAKE_BINARY_DIR}/src/frameworks/Accelerate/vecLib/BNNS/libBNNS.dylib \ 78 78 -Wl,-dylib_file,/System/Library/Frameworks/Accelerate.framework/Versions/A/Frameworks/vecLib.framework/Versions/A/libSparse.dylib\ 79 - :${CMAKE_BINARY_DIR}/src/Accelerate/vecLib/Sparse/libSparse.dylib \ 80 - -Wl,-dylib_file,/System/Library/Frameworks/ColorSync.framework/Versions/A/ColorSync:${CMAKE_BINARY_DIR}/src/ColorSync/ColorSync \ 79 + :${CMAKE_BINARY_DIR}/src/frameworks/Accelerate/vecLib/Sparse/libSparse.dylib \ 80 + -Wl,-dylib_file,/System/Library/Frameworks/ColorSync.framework/Versions/A/ColorSync:${CMAKE_BINARY_DIR}/src/frameworks/ColorSync/ColorSync \ 81 81 -Wl,-dylib_file,/System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/ATS.framework/Versions/A/ATS\ 82 - :${CMAKE_BINARY_DIR}/src/ApplicationServices/ATS/ATS \ 82 + :${CMAKE_BINARY_DIR}/src/frameworks/ApplicationServices/ATS/ATS \ 83 83 -Wl,-dylib_file,/System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/ColorSyncLegacy.framework/Versions/A/ColorSyncLegacy\ 84 - :${CMAKE_BINARY_DIR}/src/ApplicationServices/ColorSyncLegacy/ColorSyncLegacy \ 84 + :${CMAKE_BINARY_DIR}/src/frameworks/ApplicationServices/ColorSyncLegacy/ColorSyncLegacy \ 85 85 -Wl,-dylib_file,/System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/HIServices.framework/Versions/A/HIServices\ 86 - :${CMAKE_BINARY_DIR}/src/ApplicationServices/HIServices/HIServices \ 86 + :${CMAKE_BINARY_DIR}/src/frameworks/ApplicationServices/HIServices/HIServices \ 87 87 -Wl,-dylib_file,/System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/LangAnalysis.framework/Versions/A/LangAnalysis\ 88 - :${CMAKE_BINARY_DIR}/src/ApplicationServices/LangAnalysis/LangAnalysis \ 88 + :${CMAKE_BINARY_DIR}/src/frameworks/ApplicationServices/LangAnalysis/LangAnalysis \ 89 89 -Wl,-dylib_file,/System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/PrintCore.framework/Versions/A/PrintCore\ 90 - :${CMAKE_BINARY_DIR}/src/ApplicationServices/PrintCore/PrintCore \ 90 + :${CMAKE_BINARY_DIR}/src/frameworks/ApplicationServices/PrintCore/PrintCore \ 91 91 -Wl,-dylib_file,/System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/QD.framework/Versions/A/QD\ 92 - :${CMAKE_BINARY_DIR}/src/ApplicationServices/QD/QD \ 92 + :${CMAKE_BINARY_DIR}/src/frameworks/ApplicationServices/QD/QD \ 93 93 -Wl,-dylib_file,/System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/SpeechSynthesis.framework/Versions/A/SpeechSynthesis\ 94 - :${CMAKE_BINARY_DIR}/src/ApplicationServices/SpeechSynthesis/SpeechSynthesis \ 95 - -Wl,-dylib_file,/System/Library/Frameworks/CoreServices.framework/Versions/A/CoreServices:${CMAKE_BINARY_DIR}/src/CoreServices/CoreServices \ 96 - -Wl,-dylib_file,/System/Library/Frameworks/ApplicationServices.framework/Versions/A/ApplicationServices:${CMAKE_BINARY_DIR}/src/ApplicationServices/ApplicationServices \ 94 + :${CMAKE_BINARY_DIR}/src/frameworks/ApplicationServices/SpeechSynthesis/SpeechSynthesis \ 95 + -Wl,-dylib_file,/System/Library/Frameworks/CoreServices.framework/Versions/A/CoreServices:${CMAKE_BINARY_DIR}/src/frameworks/CoreServices/CoreServices \ 96 + -Wl,-dylib_file,/System/Library/Frameworks/ApplicationServices.framework/Versions/A/ApplicationServices:${CMAKE_BINARY_DIR}/src/frameworks/ApplicationServices/ApplicationServices \ 97 97 -Wl,-dylib_file,/System/Library/Frameworks/CoreGraphics.framework/Versions/A/CoreGraphics:${CMAKE_BINARY_DIR}/src/external/cocotron/CoreGraphics/CoreGraphics \ 98 98 -Wl,-dylib_file,/System/Library/Frameworks/CoreText.framework/Versions/A/CoreText:${CMAKE_BINARY_DIR}/src/external/cocotron/CoreText/CoreText \ 99 99 -Wl,-dylib_file,/System/Library/Frameworks/ImageIO.framework/Versions/A/ImageIO:${CMAKE_BINARY_DIR}/src/ImageIO/ImageIO \
+9 -9
src/frameworks/ApplicationServices/CMakeLists.txt
··· 22 22 23 23 set(CoreGraphics_BUILD ${CMAKE_BINARY_DIR}/src/external/cocotron/CoreGraphics/CoreGraphics) 24 24 set(CoreText_BUILD ${CMAKE_BINARY_DIR}/src/external/cocotron/CoreText/CoreText) 25 - set(CoreServices_BUILD ${CMAKE_BINARY_DIR}/src/CoreServices/CoreServices) 25 + set(CoreServices_BUILD ${CMAKE_BINARY_DIR}/src/frameworks/CoreServices/CoreServices) 26 26 set(ImageIO_BUILD ${CMAKE_BINARY_DIR}/src/ImageIO/ImageIO) 27 - set(ColorSync_BUILD ${CMAKE_BINARY_DIR}/src/ColorSync/ColorSync) 28 - set(ATS_BUILD ${CMAKE_BINARY_DIR}/src/ApplicationServices/ATS/ATS) 29 - set(ColorSyncLegacy_BUILD ${CMAKE_BINARY_DIR}/src/ApplicationServices/ColorSyncLegacy/ColorSyncLegacy) 30 - set(HIServices_BUILD ${CMAKE_BINARY_DIR}/src/ApplicationServices/HIServices/HIServices) 31 - set(LangAnalysis_BUILD ${CMAKE_BINARY_DIR}/src/ApplicationServices/LangAnalysis/LangAnalysis) 32 - set(PrintCore_BUILD ${CMAKE_BINARY_DIR}/src/ApplicationServices/PrintCore/PrintCore) 33 - set(QD_BUILD ${CMAKE_BINARY_DIR}/src/ApplicationServices/QD/QD) 34 - set(SpeechSynthesis_BUILD ${CMAKE_BINARY_DIR}/src/ApplicationServices/SpeechSynthesis/SpeechSynthesis) 27 + set(ColorSync_BUILD ${CMAKE_BINARY_DIR}/src/frameworks/ColorSync/ColorSync) 28 + set(ATS_BUILD ${CMAKE_BINARY_DIR}/src/frameworks/ApplicationServices/ATS/ATS) 29 + set(ColorSyncLegacy_BUILD ${CMAKE_BINARY_DIR}/src/frameworks/ApplicationServices/ColorSyncLegacy/ColorSyncLegacy) 30 + set(HIServices_BUILD ${CMAKE_BINARY_DIR}/src/frameworks/ApplicationServices/HIServices/HIServices) 31 + set(LangAnalysis_BUILD ${CMAKE_BINARY_DIR}/src/frameworks/ApplicationServices/LangAnalysis/LangAnalysis) 32 + set(PrintCore_BUILD ${CMAKE_BINARY_DIR}/src/frameworks/ApplicationServices/PrintCore/PrintCore) 33 + set(QD_BUILD ${CMAKE_BINARY_DIR}/src/frameworks/ApplicationServices/QD/QD) 34 + set(SpeechSynthesis_BUILD ${CMAKE_BINARY_DIR}/src/frameworks/ApplicationServices/SpeechSynthesis/SpeechSynthesis) 35 35 36 36 reexport(ApplicationServices CoreGraphics ${CoreGraphics_BUILD}) 37 37 reexport(ApplicationServices CoreText ${CoreText_BUILD})
+3 -23
src/frameworks/CoreServices/CMakeLists.txt
··· 1 1 project(CoreServices) 2 2 3 - cmake_minimum_required(VERSION 2.4.0) 4 - if(COMMAND cmake_policy) 5 - cmake_policy(SET CMP0003 NEW) 6 - endif(COMMAND cmake_policy) 7 - 8 - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -fno-rtti -fno-exceptions -nostdinc -nostdinc++") 3 + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -fno-rtti -fno-exceptions") 9 4 10 5 include_directories(BEFORE ${CMAKE_SOURCE_DIR}/src/external/libcxx/include) 11 - include_directories( 12 - ${CMAKE_CURRENT_SOURCE_DIR} 13 - ${CMAKE_SOURCE_DIR}/src/libc/include/FreeBSD 14 - ${CMAKE_SOURCE_DIR}/src/libiconv/include 15 - ${CMAKE_SOURCE_DIR}/src/external/icu/icuSources/common 16 - ${CMAKE_SOURCE_DIR}/src/external/icu/icuSources/i18n 17 - ${CMAKE_SOURCE_DIR}/src/external/corefoundation 18 - ${CMAKE_SOURCE_DIR}/src/external/foundation/include 19 - ${CMAKE_SOURCE_DIR}/src/external/libclosure 20 - ) 21 6 22 7 set(CoreServices_SRCS 23 8 CoreEndian.cpp ··· 47 32 LSApplicationWorkspace.m 48 33 constants.m 49 34 ) 50 - 51 - if (WITH_COREAUDIO) 52 - set(EXTRA_LIBS AudioUnit) 53 - endif (WITH_COREAUDIO) 54 35 55 36 set(DYLIB_COMPAT_VERSION "1.0.0") 56 37 set(DYLIB_CURRENT_VERSION "1239.200.12") ··· 100 81 ${EXTRA_LIBS} 101 82 ) 102 83 103 - set(FSEvents_BUILD ${CMAKE_BINARY_DIR}/src/CoreServices/FSEvents) 104 - set(LaunchServices_BUILD ${CMAKE_BINARY_DIR}/src/CoreServices/LaunchServices) 84 + set(FSEvents_BUILD ${CMAKE_CURRENT_BINARY_DIR}/FSEvents) 85 + set(LaunchServices_BUILD ${CMAKE_CURRENT_BINARY_DIR}/LaunchServices) 105 86 set(CFNetwork_BUILD ${CMAKE_BINARY_DIR}/src/external/cfnetwork/src/CFNetwork) 106 87 reexport(CoreServices FSEvents ${FSEvents_BUILD}) 107 88 reexport(CoreServices LaunchServices ${LaunchServices_BUILD}) 108 89 reexport(CoreServices CFNetwork ${CFNetwork_BUILD}) 109 90 110 91 install(FILES SystemVersion.plist DESTINATION "libexec/darling/System/Library/CoreServices") 111 -