Attempt to fix build by reverting #8193 and related commits

Author: kperryua

CMakeLists.txt

@@ -52,11 +52,7 @@ find_package(Foundation QUIET)
 find_package(SQLite3 REQUIRED)
 
 # Enable `package` modifier for the whole package.
-if(CMAKE_SYSTEM_NAME STREQUAL FreeBSD)
-  add_compile_options("$<$<COMPILE_LANGUAGE:Swift>:-package-name;SwiftPM>" -L/usr/local/lib)
-else()
-  add_compile_options("$<$<COMPILE_LANGUAGE:Swift>:-package-name;SwiftPM>")
-endif()
+add_compile_options("$<$<COMPILE_LANGUAGE:Swift>:-package-name;SwiftPM>")
 
 add_subdirectory(BuildSupport/SwiftSyntax)
 add_subdirectory(Sources)

Package.swift

@@ -205,7 +205,7 @@ let package = Package(
             name: "Basics",
             dependencies: [
                 "_AsyncFileSystem",
-                .target(name: "SPMSQLite3", condition: .when(platforms: [.macOS, .iOS, .tvOS, .watchOS, .visionOS, .macCatalyst, .linux, .custom("freebsd")])),
+                .target(name: "SPMSQLite3", condition: .when(platforms: [.macOS, .iOS, .tvOS, .watchOS, .visionOS, .macCatalyst, .linux])),
                 .product(name: "SwiftToolchainCSQLite", package: "swift-toolchain-sqlite", condition: .when(platforms: [.windows, .android])),
                 .product(name: "DequeModule", package: "swift-collections"),
                 .product(name: "OrderedCollections", package: "swift-collections"),

Sources/Basics/Archiver/ZipArchiver.swift

@@ -109,13 +109,6 @@ public struct ZipArchiver: Archiver, Cancellable {
             arguments: [windowsTar, "-a", "-c", "-f", destinationPath.pathString, directory.basename],
             workingDirectory: directory.parentDirectory
         )
-        #elseif os(FreeBSD)
-        // On FreeBSD, the unzip command is available in base but not the zip command.
-        // Therefore; we use libarchive(bsdtar) to produce the ZIP archive instead.
-        let process = AsyncProcess(
-          arguments: ["tar", "-c", "--format", "zip", "-f", destinationPath.pathString, directory.basename],
-          workingDirectory: directory.parentDirectory
-        )
         #else
         // This is to work around `swift package-registry publish` tool failing on
         // Amazon Linux 2 due to it having an earlier Glibc version (rdar://116370323)

Sources/Basics/Cancellator.swift

@@ -75,7 +75,7 @@ public final class Cancellator: Cancellable, Sendable {
 
                 // Install the default signal handler.
                 var action = sigaction()
-                #if canImport(Darwin) || os(OpenBSD) || os(FreeBSD)
+                #if canImport(Darwin) || os(OpenBSD)
                 action.__sigaction_u.__sa_handler = SIG_DFL
                 #elseif canImport(Musl)
                 action.__sa_handler.sa_handler = SIG_DFL

Sources/Basics/Concurrency/AsyncProcess.swift

@@ -553,7 +553,7 @@ package final class AsyncProcess {
         return stdinPipe.fileHandleForWriting
         #elseif(!canImport(Darwin) || os(macOS))
         // Initialize the spawn attributes.
-        #if canImport(Darwin) || os(Android) || os(OpenBSD) || os(FreeBSD)
+        #if canImport(Darwin) || os(Android) || os(OpenBSD)
         var attributes: posix_spawnattr_t? = nil
         #else
         var attributes = posix_spawnattr_t()
@@ -598,7 +598,7 @@ package final class AsyncProcess {
         posix_spawnattr_setflags(&attributes, Int16(flags))
 
         // Setup the file actions.
-        #if canImport(Darwin) || os(Android) || os(OpenBSD) || os(FreeBSD)
+        #if canImport(Darwin) || os(Android) || os(OpenBSD)
         var fileActions: posix_spawn_file_actions_t? = nil
         #else
         var fileActions = posix_spawn_file_actions_t()
@@ -614,8 +614,6 @@ package final class AsyncProcess {
             if #available(macOS 10.15, *) {
                 posix_spawn_file_actions_addchdir_np(&fileActions, workingDirectory)
             }
-            #elseif os(FreeBSD)
-            posix_spawn_file_actions_addchdir_np(&fileActions, workingDirectory)
             #elseif os(Linux)
             guard SPM_posix_spawn_file_actions_addchdir_np_supported() else {
                 throw AsyncProcess.Error.workingDirectoryNotSupported

Sources/Basics/DispatchTimeInterval+Extensions.swift

@@ -95,7 +95,7 @@ extension DispatchTimeInterval {
 }
 
 // remove when available to all platforms
-#if os(Linux) || os(Windows) || os(Android) || os(OpenBSD) || os(FreeBSD)
+#if os(Linux) || os(Windows) || os(Android) || os(OpenBSD)
 extension DispatchTime {
     public func distance(to: DispatchTime) -> DispatchTimeInterval {
         let final = to.uptimeNanoseconds

Sources/Basics/Triple+Basics.swift

@@ -62,10 +62,6 @@ extension Triple {
         os == .openbsd
     }
 
-    public func isFreeBSD() -> Bool {
-        os == .freebsd
-    }
-
     /// Returns the triple string for the given platform version.
     ///
     /// This is currently meant for Apple platforms only.
@@ -143,7 +139,7 @@ extension Triple {
         switch os {
         case _ where isDarwin():
             return ".dylib"
-        case .linux, .openbsd, .freebsd:
+        case .linux, .openbsd:
             return ".so"
         case .win32:
             return ".dll"
@@ -183,7 +179,7 @@ extension Triple {
         switch os {
         case _ where isDarwin():
             return ""
-        case .linux, .openbsd, .freebsd:
+        case .linux, .openbsd:
             return ""
         case .win32:
             return ".exe"

Sources/Basics/Vendor/Triple+Platforms.swift

@@ -304,7 +304,7 @@ extension Triple {
 
     case .linux:
       return environment == .android ? "android" : "linux"
-    case .freebsd:
+    case .freeBSD:
       return "freebsd"
     case .openbsd:
       return "openbsd"

Sources/Basics/Vendor/Triple.swift

@@ -1089,7 +1089,7 @@ extension Triple {
     case cloudABI = "cloudabi"
     case darwin
     case dragonFly = "dragonfly"
-    case freebsd = "freebsd"
+    case freeBSD = "freebsd"
     case fuchsia
     case ios
     case kfreebsd
@@ -1137,7 +1137,7 @@ extension Triple {
       case _ where os.hasPrefix("dragonfly"):
         return .dragonFly
       case _ where os.hasPrefix("freebsd"):
-        return .freebsd
+        return .freeBSD
       case _ where os.hasPrefix("fuchsia"):
         return .fuchsia
       case _ where os.hasPrefix("ios"):

Sources/Build/BuildDescription/ProductBuildDescription.swift

@@ -270,14 +270,11 @@ public final class ProductBuildDescription: SPMBuildCore.ProductBuildDescription
         // Set rpath such that dynamic libraries are looked up
         // adjacent to the product, unless overridden.
         if !self.buildParameters.linkingParameters.shouldDisableLocalRpath {
-            switch triple.objectFormat {
-            case .elf:
+            if triple.isLinux() {
                 args += ["-Xlinker", "-rpath=$ORIGIN"]
-            case .macho:
+            } else if triple.isDarwin() {
                 let rpath = self.product.type == .test ? "@loader_path/../../../" : "@loader_path"
                 args += ["-Xlinker", "-rpath", "-Xlinker", rpath]
-            default:
-                break
             }
         }
         args += ["@\(self.linkFileListPath.pathString)"]

Sources/Build/BuildDescription/SwiftModuleBuildDescription.swift

@@ -144,7 +144,7 @@ public final class SwiftModuleBuildDescription {
     public var moduleOutputPath: AbsolutePath { // note: needs to be public because of sourcekit-lsp
         // If we're an executable and we're not allowing test targets to link against us, we hide the module.
         let triple = buildParameters.triple
-        let allowLinkingAgainstExecutables = [.coff, .macho, .elf].contains(triple.objectFormat) && self.toolsVersion >= .v5_5
+        let allowLinkingAgainstExecutables = (triple.isDarwin() || triple.isLinux() || triple.isWindows()) && self.toolsVersion >= .v5_5
         let dirPath = (target.type == .executable && !allowLinkingAgainstExecutables) ? self.tempsPath : self.modulesPath
         return dirPath.appending(component: "\(self.target.c99name).swiftmodule")
     }

Sources/Build/BuildPlan/BuildPlan+Product.swift

@@ -63,7 +63,7 @@ extension BuildPlan {
             for description in dependencies.staticTargets {
                 if case let target as ClangModule = description.module.underlying, target.isCXX {
                     let triple = buildProduct.buildParameters.triple
-                    if triple.isDarwin() || triple.isFreeBSD() {
+                    if triple.isDarwin() {
                         buildProduct.additionalFlags += ["-lc++"]
                     } else if triple.isWindows() {
                         // Don't link any C++ library.

Sources/Build/BuildPlan/BuildPlan.swift

@@ -146,12 +146,11 @@ extension BuildParameters {
     /// platform, or nil if the linker doesn't support it for the platform.
     func linkerFlagsForRenamingMainFunction(of target: ResolvedModule) -> [String]? {
         let args: [String]
-        switch self.triple.objectFormat {
-        case .macho:
+        if self.triple.isApple() {
             args = ["-alias", "_\(target.c99name)_main", "_main"]
-        case .elf:
+        } else if self.triple.isLinux() {
             args = ["--defsym", "main=\(target.c99name)_main"]
-        default:
+        } else {
             return nil
         }
         return args.asSwiftcLinkerFlags()

Sources/Commands/SwiftTestCommand.swift

@@ -1538,7 +1538,7 @@ private extension Basics.Diagnostic {
 /// it duplicates the definition of this constant in its own source. Any changes
 /// to this constant in either package must be mirrored in the other.
 private var EXIT_NO_TESTS_FOUND: CInt {
-#if os(macOS) || os(Linux) || canImport(Android) || os(FreeBSD)
+#if os(macOS) || os(Linux) || canImport(Android)
     EX_UNAVAILABLE
 #elseif os(Windows)
     ERROR_NOT_FOUND

Sources/PackageCollections/Providers/JSONPackageCollectionProvider.swift

@@ -32,7 +32,7 @@ private typealias JSONModel = PackageCollectionModel.V1
 struct JSONPackageCollectionProvider: PackageCollectionProvider {
     // TODO: This can be removed when the `Security` framework APIs that the `PackageCollectionsSigning`
     // module depends on are available on all Apple platforms.
-    #if os(macOS) || os(Linux) || os(Windows) || os(Android) || os(FreeBSD)
+    #if os(macOS) || os(Linux) || os(Windows) || os(Android)
     static let isSignatureCheckSupported = true
     #else
     static let isSignatureCheckSupported = false
@@ -551,8 +551,6 @@ extension PackageModel.Platform {
             self = PackageModel.Platform.wasi
         case let name where name.contains("openbsd"):
             self = PackageModel.Platform.openbsd
-        case let name where name.contains("freebsd"):
-            self = PackageModel.Platform.freebsd
         default:
             return nil
         }

Sources/PackageDescription/SupportedPlatforms.swift

@@ -69,10 +69,6 @@ public struct Platform: Equatable, Sendable {
     /// The OpenBSD platform.
     @available(_PackageDescription, introduced: 5.8)
     public static let openbsd: Platform = Platform(name: "openbsd")
-
-    /// The FreeBSD platform.
-    @available(_PackageDescription, introduced: 999.0)
-    public static let freebsd: Platform = Platform(name: "freebsd")
 }
 
 /// A platform that the Swift package supports.

Sources/PackageLoading/Platform.swift

@@ -25,7 +25,6 @@ public enum Platform: Equatable, Sendable {
     case darwin
     case linux(LinuxFlavor)
     case windows
-    case freebsd
 
     /// Recognized flavors of linux.
     public enum LinuxFlavor: Equatable, Sendable {
@@ -45,8 +44,6 @@ extension Platform {
         {
         case "darwin"?:
             return .darwin
-        case "freebsd"?:
-            return .freebsd
         case "linux"?:
             return Platform.findCurrentPlatformLinux(localFileSystem)
         default:
@@ -92,15 +89,15 @@ extension Platform {
     public var dynamicLibraryExtension: String {
         switch self {
         case .darwin: return ".dylib"
-        case .linux, .android, .freebsd: return ".so"
+        case .linux, .android: return ".so"
         case .windows: return ".dll"
         }
     }
 
     public var executableExtension: String {
         switch self {
         case .windows: return ".exe"
-        case .linux, .android, .darwin, .freebsd: return ""
+        case .linux, .android, .darwin: return ""
         }
     }
 }

Sources/PackageLoading/Target+PkgConfig.swift

@@ -154,8 +154,6 @@ extension SystemPackageProviderDescription {
             return "    yum install \(packages.joined(separator: " "))\n"
         case .nuget(let packages):
             return "    nuget install \(packages.joined(separator: " "))\n"
-        case .pkg(let packages):
-            return "    pkg install \(packages.joined(separator: " "))\n"
         }
     }
 
@@ -182,13 +180,9 @@ extension SystemPackageProviderDescription {
             switch platform {
             case .darwin, .windows, .linux:
                 return true
-            case .android, .freebsd:
+            case .android:
                 return false
             }
-        case .pkg:
-            if case .freebsd = platform {
-                return true
-            }
         }
         return false
     }
@@ -221,8 +215,6 @@ extension SystemPackageProviderDescription {
             return []
         case .nuget:
             return []
-        case .pkg:
-            return []
         }
     }
 

Sources/PackageModel/Manifest/SystemPackageProviderDescription.swift

@@ -16,12 +16,11 @@ public enum SystemPackageProviderDescription: Hashable, Codable, Sendable {
     case apt([String])
     case yum([String])
     case nuget([String])
-    case pkg([String])
 }
 
 extension SystemPackageProviderDescription {
     private enum CodingKeys: String, CodingKey {
-        case brew, apt, yum, nuget, pkg
+        case brew, apt, yum, nuget
     }
 
     public func encode(to encoder: Encoder) throws {
@@ -39,9 +38,6 @@ extension SystemPackageProviderDescription {
         case let .nuget(a1):
             var unkeyedContainer = container.nestedUnkeyedContainer(forKey: .nuget)
             try unkeyedContainer.encode(a1)
-        case let .pkg(a1):
-            var unkeyedContainer = container.nestedUnkeyedContainer(forKey: .pkg)
-            try unkeyedContainer.encode(a1)
         }
     }
 
@@ -67,10 +63,6 @@ extension SystemPackageProviderDescription {
             var unkeyedValues = try values.nestedUnkeyedContainer(forKey: key)
             let a1 = try unkeyedValues.decode([String].self)
             self = .nuget(a1)
-        case .pkg:
-            var unkeyedValues = try values.nestedUnkeyedContainer(forKey: key)
-            let a1 = try unkeyedValues.decode([String].self)
-            self = .pkg(a1)
         }
     }
 }

Sources/PackageModel/ManifestSourceGeneration.swift

@@ -416,9 +416,6 @@ fileprivate extension SourceCodeFragment {
         case .nuget(let names):
             let params = [SourceCodeFragment(strings: names)]
             self.init(enum: "nuget", subnodes: params)
-        case .pkg(let names):
-            let params = [SourceCodeFragment(strings: names)]
-            self.init(enum: "pkg", subnodes: params)
         }
     }
 

Sources/PackageModel/Platform.swift

@@ -49,8 +49,6 @@ public struct Platform: Equatable, Hashable, Codable, Sendable {
     public static let windows: Platform = Platform(name: "windows", oldestSupportedVersion: .unknown)
     public static let wasi: Platform = Platform(name: "wasi", oldestSupportedVersion: .unknown)
     public static let openbsd: Platform = Platform(name: "openbsd", oldestSupportedVersion: .unknown)
-    public static let freebsd: Platform = Platform(name: "freebsd", oldestSupportedVersion: .unknown)
-
 
 }
 

Sources/PackageModel/PlatformRegistry.swift

@@ -38,7 +38,6 @@ public struct PlatformRegistry {
             .macOS,
             .macCatalyst,
             .openbsd,
-            .freebsd,
             .tvOS,
             .visionOS,
             .wasi,

Sources/SPMBuildCore/BinaryTarget+Extensions.swift

@@ -99,7 +99,7 @@ extension Triple.OS {
     /// Returns a representation of the receiver that can be compared with platform strings declared in an XCFramework.
     fileprivate var asXCFrameworkPlatformString: String? {
         switch self {
-        case .darwin, .linux, .wasi, .win32, .openbsd, .freebsd, .noneOS:
+        case .darwin, .linux, .wasi, .win32, .openbsd, .noneOS:
             return nil // XCFrameworks do not support any of these platforms today.
         case .macosx:
             return "macos"

Sources/SPMBuildCore/BuildParameters/BuildParameters.swift

@@ -115,8 +115,6 @@ public struct BuildParameters: Encodable {
             return .windows
         } else if self.triple.isOpenBSD() {
             return .openbsd
-        } else if self.triple.isFreeBSD() {
-            return .freebsd
         } else {
             return .linux
         }

Sources/SPMBuildCore/Triple+Extensions.swift

@@ -16,8 +16,6 @@ extension Triple {
     public var platformBuildPathComponent: String {
         if isDarwin() {
             return self.tripleString(forPlatformVersion: "")
-        } else if isFreeBSD() {
-            return "\(self.archName)-\(self.vendorName)-\(self.osNameUnversioned)"
         }
 
         return self.tripleString