Skip to content

Commit d9b83c0

Browse files
committed
Fix soundness
1 parent 5bce892 commit d9b83c0

File tree

2 files changed

+15
-15
lines changed

2 files changed

+15
-15
lines changed

Package.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ let swiftlyTarget: Target = .executableTarget(
88
dependencies: [
99
.product(name: "ArgumentParser", package: "swift-argument-parser"),
1010
.target(name: "SwiftlyCore"),
11-
.product(name: "SwiftToolsSupport-auto", package: "swift-tools-support-core")
11+
.product(name: "SwiftToolsSupport-auto", package: "swift-tools-support-core"),
1212
]
1313
)
1414

libarchive/Package.swift

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,10 @@ let package = Package(
3434
name: "bsdcat",
3535
targets: ["bsdcat"]
3636
),
37-
/*.executable(
38-
name: "bsdcpio",
39-
targets: ["bsdcpio"]
40-
),*/
37+
/* .executable(
38+
name: "bsdcpio",
39+
targets: ["bsdcpio"]
40+
), */
4141
.executable(
4242
name: "bsdtar",
4343
targets: ["bsdtar"]
@@ -69,13 +69,13 @@ let package = Package(
6969
exclude: ["test"],
7070
cSettings: [.define("PLATFORM_CONFIG_H", to: "\"config_swiftpm.h\"")]
7171
),
72-
/*.executableTarget(
73-
name: "bsdcpio",
74-
dependencies: ["CLibArchive", "CLibArchiveFE"],
75-
path: "cpio",
76-
exclude: ["test"],
77-
cSettings: [.define("PLATFORM_CONFIG_H", to: "\"config_swiftpm.h\"")]
78-
),*/
72+
/* .executableTarget(
73+
name: "bsdcpio",
74+
dependencies: ["CLibArchive", "CLibArchiveFE"],
75+
path: "cpio",
76+
exclude: ["test"],
77+
cSettings: [.define("PLATFORM_CONFIG_H", to: "\"config_swiftpm.h\"")]
78+
), */
7979
.executableTarget(
8080
name: "bsdtar",
8181
dependencies: ["CLibArchive", "CLibArchiveFE"],
@@ -95,7 +95,7 @@ let package = Package(
9595

9696
// This is a list of system libraries that can be enabled in libarchive to add extra functionality using the specified environment variable in swift build
9797
let libs = [
98-
//(envVar: "LIBARCHIVE_ENABLE_Z", define: "HAVE_LIBZ", libName: "zlib", moduleLoc: "swiftpm/zlib", pkgConfig: "zlib", aptProvider: "zlib1g-dev")
98+
// (envVar: "LIBARCHIVE_ENABLE_Z", define: "HAVE_LIBZ", libName: "zlib", moduleLoc: "swiftpm/zlib", pkgConfig: "zlib", aptProvider: "zlib1g-dev")
9999
(envVar: "LIBARCHIVE_ENABLE_LIBLZMA", define: "HAVE_LIBLZMA", libName: "lzma", moduleLoc: "swiftpm/lzma", pkgConfig: "liblzma", aptProvider: "liblzma-dev"),
100100
(envVar: "LIBARCHIVE_ENABLE_LIBZSTD", define: "HAVE_LIBZSTD", libName: "zstd", moduleLoc: "swiftpm/zstd", pkgConfig: "libzstd", aptProvider: "libzstd-dev"),
101101
(envVar: "LIBARCHIVE_ENABLE_LIBACL", define: "HAVE_LIBACL", libName: "acl", moduleLoc: "swiftpm/acl", pkgConfig: "libacl", aptProvider: "libacl1-dev"),
@@ -111,8 +111,8 @@ let libs = [
111111
(envVar: "LIBARCHIVE_ENABLE_LIBLZO2", define: "HAVE_LIBLZO2", libName: "lzo2", moduleLoc: "swiftpm/lzo2", pkgConfig: "liblzo2", aptProvider: "liblzo2-dev"),
112112
(envVar: "LIBARCHIVE_ENABLE_LIBMBEDCRYPTO", define: "HAVE_LIBMBEDCRYPTO", libName: "mbedcrypto", moduleLoc: "swiftpm/mbedcrypto", pkgConfig: "libmbedcrypto", aptProvider: "libmbedcrypto7"),
113113
(envVar: "LIBARCHIVE_ENABLE_LIBNETTLE", define: "HAVE_LIBNETTLE", libName: "nettle", moduleLoc: "swiftpm/nettle", pkgConfig: "nettle", aptProvider: "nettle-dev"),
114-
//(envVar: "LIBARCHIVE_ENABLE_LIBPCRE", define: "HAVE_LIBPCRE", libName: "pcre", moduleLoc: "swiftpm/pcre", pkgConfig: "libpcre", aptProvider: "libpcre-dev"),
115-
//(envVar: "LIBARCHIVE_ENABLE_LIBPCREPOSIX", define: "HAVE_LIBPCREPOSIX", libName: "pcreposix", moduleLoc: "swiftpm/pcreposix", pkgConfig: "libpcre-posix", aptProvider: "libpcre-dev"),
114+
// (envVar: "LIBARCHIVE_ENABLE_LIBPCRE", define: "HAVE_LIBPCRE", libName: "pcre", moduleLoc: "swiftpm/pcre", pkgConfig: "libpcre", aptProvider: "libpcre-dev"),
115+
// (envVar: "LIBARCHIVE_ENABLE_LIBPCREPOSIX", define: "HAVE_LIBPCREPOSIX", libName: "pcreposix", moduleLoc: "swiftpm/pcreposix", pkgConfig: "libpcre-posix", aptProvider: "libpcre-dev"),
116116
(envVar: "LIBARCHIVE_ENABLE_LIBPCRE2", define: "HAVE_LIBPCRE2", libName: "pcre2", moduleLoc: "swiftpm/pcre2", pkgConfig: "libpcre2-8", aptProvider: "libpcre2-dev"),
117117
(envVar: "LIBARCHIVE_ENABLE_LIBPCRE2POSIX", define: "HAVE_LIBPCRE2POSIX", libName: "pcre2posix", moduleLoc: "swiftpm/pcre2posix", pkgConfig: "libpcre2-posix", aptProvider: "libpcre2-dev"),
118118
(envVar: "LIBARCHIVE_ENABLE_LIBXML2", define: "HAVE_LIBXML2", libName: "xml2", moduleLoc: "swiftpm/xml2", pkgConfig: "libxml-2.0", aptProvider: "libxml2-dev"),

0 commit comments

Comments
 (0)