Fix build

Requires apple/swift-crypto#65

Author: yim-lee

CMakeLists.txt

@@ -1,6 +1,6 @@
 # This source file is part of the Swift.org open source project
 #
-# Copyright (c) 2014 - 2019 Apple Inc. and the Swift project authors
+# Copyright (c) 2014 - 2021 Apple Inc. and the Swift project authors
 # Licensed under Apache License v2.0 with Runtime Library Exception
 #
 # See http://swift.org/LICENSE.txt for license information
@@ -47,7 +47,7 @@ if(FIND_PM_DEPS)
   endif()
 
   find_package(ArgumentParser CONFIG REQUIRED)
-  find_package(Crypto CONFIG REQUIRED)
+  find_package(SwiftCrypto CONFIG REQUIRED)
   find_package(SwiftDriver CONFIG REQUIRED)
 endif()
 

Sources/PackageCollections/CMakeLists.txt

@@ -33,11 +33,14 @@ target_link_libraries(PackageCollections PUBLIC
   TSCUtility
   Basics
   Crypto
+  CCryptoBoringSSL
   PackageModel
   SourceControl)
 # NOTE(compnerd) workaround for CMake not setting up include flags yet
 set_target_properties(PackageCollections PROPERTIES
   INTERFACE_INCLUDE_DIRECTORIES ${CMAKE_Swift_MODULE_DIRECTORY})
+target_link_options(PackageCollections PRIVATE
+    "$<$<PLATFORM_ID:Darwin>:SHELL:-Xlinker -framework -Xlinker Security>")
 
 if(USE_CMAKE_INSTALL)
 install(TARGETS PackageCollections

Sources/PackageCollections/Signing/PackageCollectionSignature.swift

@@ -0,0 +1,16 @@
+/*
+ This source file is part of the Swift.org open source project
+
+ Copyright (c) 2021 Apple Inc. and the Swift project authors
+ Licensed under Apache License v2.0 with Runtime Library Exception
+
+ See http://swift.org/LICENSE.txt for license information
+ See http://swift.org/CONTRIBUTORS.txt for Swift project authors
+ */
+
+import Crypto
+#if os(macOS) || os(iOS) || os(watchOS) || os(tvOS)
+import Security
+#else
+import CCryptoBoringSSL
+#endif

Utilities/bootstrap

@@ -571,7 +571,6 @@ def build_swift_crypto(args):
         cmake_flags.append("-DCMAKE_C_FLAGS=-target %s%s" % (get_build_target(args), g_macos_deployment_target))
         cmake_flags.append("-DCMAKE_OSX_DEPLOYMENT_TARGET=%s" % g_macos_deployment_target)
 
-    cmake_flags.append("-DBUILD_SHARED_LIBS=YES")
     build_with_cmake(args, cmake_flags, args.swift_crypto_source_dir, args.swift_crypto_build_dir)
 
 def add_rpath_for_cmake_build(args, rpath):
@@ -592,7 +591,7 @@ def build_swiftpm_with_cmake(args):
             "-DYams_DIR=" + os.path.join(args.yams_build_dir, "cmake/modules"),
             "-DArgumentParser_DIR=" + os.path.join(args.swift_argument_parser_build_dir, "cmake/modules"),
             "-DSwiftDriver_DIR=" + os.path.join(args.swift_driver_build_dir, "cmake/modules"),
-            "-DCrypto_DIR=" + os.path.join(args.swift_crypto_build_dir, "cmake/modules"),
+            "-DSwiftCrypto_DIR=" + os.path.join(args.swift_crypto_build_dir, "cmake/modules"),
             "-DFIND_PM_DEPS:BOOL=YES",
         ]
     else: