Use the vendored and SwiftPM support libarchive for swiftly

Author: cmcgee1024

Package.swift

@@ -1,7 +1,17 @@
 // swift-tools-version:5.10
 
+import Foundation
 import PackageDescription
 
+let swiftlyTarget: Target = .executableTarget(
+    name: "Swiftly",
+    dependencies: [
+        .product(name: "ArgumentParser", package: "swift-argument-parser"),
+        .target(name: "SwiftlyCore"),
+        .product(name: "SwiftToolsSupport-auto", package: "swift-tools-support-core"),
+    ]
+)
+
 let ghApiCacheResources = (1...16).map { Resource.embedInCode("gh-api-cache/swift-tags-page\($0).json") }
 let ghApiCacheExcludedResources = (17...27).map { "gh-api-cache/swift-tags-page\($0).json" }
 
@@ -24,16 +34,7 @@ let package = Package(
         .package(url: "https://github.com/apple/swift-docc-plugin", from: "1.3.0"),
     ],
     targets: [
-        .executableTarget(
-            name: "Swiftly",
-            dependencies: [
-                .product(name: "ArgumentParser", package: "swift-argument-parser"),
-                .target(name: "SwiftlyCore"),
-                .target(name: "LinuxPlatform", condition: .when(platforms: [.linux])),
-                .target(name: "MacOSPlatform", condition: .when(platforms: [.macOS])),
-                .product(name: "SwiftToolsSupport-auto", package: "swift-tools-support-core"),
-            ]
-        ),
+        swiftlyTarget,
         .target(
             name: "SwiftlyCore",
             dependencies: [
@@ -65,29 +66,6 @@ let package = Package(
             ],
             path: "Tools/generate-docs-reference"
         ),
-        .target(
-            name: "LinuxPlatform",
-            dependencies: [
-                "SwiftlyCore",
-                "CLibArchive",
-            ],
-            linkerSettings: [
-                .linkedLibrary("z"),
-            ]
-        ),
-        .target(
-            name: "MacOSPlatform",
-            dependencies: [
-                "SwiftlyCore",
-            ]
-        ),
-        .systemLibrary(
-            name: "CLibArchive",
-            pkgConfig: "libarchive",
-            providers: [
-                .apt(["libarchive-dev"]),
-            ]
-        ),
         .testTarget(
             name: "SwiftlyTests",
             dependencies: ["Swiftly"],
@@ -99,3 +77,31 @@ let package = Package(
         ),
     ]
 )
+
+#if os(Linux)
+
+package.dependencies.append(.package(path: "libarchive"))
+package.targets.append(
+    .target(
+        name: "LinuxPlatform",
+        dependencies: [
+            .target(name: "SwiftlyCore"),
+            .product(name: "archive-devel", package: "libarchive"),
+        ]
+    )
+)
+swiftlyTarget.dependencies.append(.target(name: "LinuxPlatform"))
+
+#elseif os(macOS)
+
+package.targets.append(
+    .target(
+        name: "MacOSPlatform",
+        dependencies: [
+            "SwiftlyCore",
+        ]
+    )
+)
+swiftlyTarget.dependencies.append(.target(name: "MacOSPlatform"))
+
+#endif

Sources/CLibArchive/module.modulemap

@@ -1,5 +1,5 @@
 ARG base_image=redhat/ubi9:latest
 FROM $base_image
 
-RUN yum install --allowerasing -y curl gcc-c++ gpg
+RUN yum install --allowerasing -y curl gpg
 RUN echo 'export PATH="$HOME/.local/bin:$PATH"' >> $HOME/.profile

Sources/CLibArchive/shim.h

@@ -7,12 +7,7 @@ ARG ubuntu_version
 # dependencies
 RUN yum install -y \
     curl \
-    gcc \
-    gcc-c++ \
-    make \
     gpg
-COPY ./scripts/install-libarchive.sh /
-RUN /install-libarchive.sh
 
 RUN curl -L https://swift.org/keys/all-keys.asc | gpg --import
 

docker/install-test-ubi9.dockerfile

@@ -7,12 +7,7 @@ ARG ubuntu_version
 # dependencies
 RUN yum install -y --allowerasing \
     curl \
-    gcc \
-    gcc-c++ \
-    make \
     gpg
-COPY ./scripts/install-libarchive.sh /
-RUN /install-libarchive.sh
 
 RUN curl -L https://swift.org/keys/all-keys.asc | gpg --import
 

docker/test-amazonlinux2.dockerfile

@@ -13,9 +13,7 @@ ENV LANG en_US.UTF-8
 ENV LANGUAGE en_US.UTF-8
 
 # dependencies
-RUN apt-get update --fix-missing && apt-get install -y curl build-essential gpg
-COPY ./scripts/install-libarchive.sh /
-RUN /install-libarchive.sh
+RUN apt-get update --fix-missing && apt-get install -y gpg curl
 
 RUN curl -L https://swift.org/keys/all-keys.asc | gpg --import
 

docker/test-ubi9.dockerfile

@@ -5,15 +5,11 @@ FROM swift:5.10-amazonlinux2
 
 # swiftly build depdenencies
 RUN yum install -y \
-    curl \
-    gcc \
-    make
+    curl
 
 COPY . /tmp/swiftly
 WORKDIR /tmp/swiftly
 
-RUN ./scripts/install-libarchive.sh
-
 RUN swift build \
       --static-swift-stdlib \
       --configuration release