Skip to content

Commit d6a1072

Browse files
keithkeith
committed
add libz
1 parent 8ed03ea commit d6a1072

3 files changed

Lines changed: 178 additions & 5 deletions

File tree

‎MODULE.bazel‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,18 +19,20 @@ bazel_dep(name = "rules_cc", version = "0.2.14")
1919
bazel_dep(name = "rules_shell", version = "0.3.0")
2020
bazel_dep(name = "swift_argument_parser", version = "1.7.0")
2121

22+
# Regenerate lockfile: bazel run @swift_ubuntu22.04_sysroot//:lock
2223
apt = use_extension("@bazel_linux_packages//apt:extensions.bzl", "apt")
2324
apt.ubuntu(
24-
name = "swift_linux_sysroot",
25+
name = "swift_ubuntu22.04_sysroot",
2526
lockfile = "//swift/internal/extensions:ubuntu22.04_sysroot.lock.json",
2627
packages = [
2728
"libc6-dev",
2829
"libstdc++-11-dev",
2930
"linux-libc-dev",
31+
"zlib1g-dev",
3032
],
3133
suites = ["jammy"],
3234
)
33-
use_repo(apt, "swift_linux_sysroot")
35+
use_repo(apt, "swift_ubuntu22.04_sysroot")
3436

3537
swift_autoconfiguration = use_repo_rule("//swift/internal:swift_autoconfiguration.bzl", "swift_autoconfiguration")
3638

‎swift/internal/extensions/toolchain.BUILD‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -130,8 +130,8 @@ cc_sysroot(
130130
"@rules_cc//cc/toolchains/actions:link_actions",
131131
"@rules_cc//cc/toolchains/actions:compile_actions",
132132
],
133-
data = ["@swift_linux_sysroot//:root"],
134-
sysroot = "@swift_linux_sysroot//:root",
133+
data = ["@swift_ubuntu22.04_sysroot//:root"],
134+
sysroot = "@swift_ubuntu22.04_sysroot//:root",
135135
)
136136

137137
cc_feature(

‎swift/internal/extensions/ubuntu22.04_sysroot.lock.json‎

Lines changed: 172 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66
"packages": [
77
"libc6-dev",
88
"libstdc++-11-dev",
9-
"linux-libc-dev"
9+
"linux-libc-dev",
10+
"zlib1g-dev"
1011
],
1112
"sources": [
1213
{
@@ -783,6 +784,176 @@
783784
"url": "https://snapshot.ubuntu.com/ubuntu/20250219T154000Z/pool/main/t/tar/tar_1.34+dfsg-1build3_amd64.deb",
784785
"version": "1.34+dfsg-1build3"
785786
},
787+
{
788+
"arch": "amd64",
789+
"dependencies": [
790+
{
791+
"key": "debconf_1.5.79ubuntu1_amd64",
792+
"name": "debconf",
793+
"version": "1.5.79ubuntu1"
794+
},
795+
{
796+
"key": "dpkg_1.21.1ubuntu2_amd64",
797+
"name": "dpkg",
798+
"version": "1.21.1ubuntu2"
799+
},
800+
{
801+
"key": "gcc-12-base_12-20220319-1ubuntu1_amd64",
802+
"name": "gcc-12-base",
803+
"version": "12-20220319-1ubuntu1"
804+
},
805+
{
806+
"key": "libacl1_2.3.1-1_amd64",
807+
"name": "libacl1",
808+
"version": "2.3.1-1"
809+
},
810+
{
811+
"key": "libbz2-1.0_1.0.8-5build1_amd64",
812+
"name": "libbz2-1.0",
813+
"version": "1.0.8-5build1"
814+
},
815+
{
816+
"key": "libc-dev-bin_2.35-0ubuntu3_amd64",
817+
"name": "libc-dev-bin",
818+
"version": "2.35-0ubuntu3"
819+
},
820+
{
821+
"key": "libc6-dev_2.35-0ubuntu3_amd64",
822+
"name": "libc6-dev",
823+
"version": "2.35-0ubuntu3"
824+
},
825+
{
826+
"key": "libc6_2.35-0ubuntu3_amd64",
827+
"name": "libc6",
828+
"version": "2.35-0ubuntu3"
829+
},
830+
{
831+
"key": "libcom-err2_1.46.5-2ubuntu1_amd64",
832+
"name": "libcom-err2",
833+
"version": "1.46.5-2ubuntu1"
834+
},
835+
{
836+
"key": "libcrypt-dev_1-4.4.27-1_amd64",
837+
"name": "libcrypt-dev",
838+
"version": "1:4.4.27-1"
839+
},
840+
{
841+
"key": "libcrypt1_1-4.4.27-1_amd64",
842+
"name": "libcrypt1",
843+
"version": "1:4.4.27-1"
844+
},
845+
{
846+
"key": "libgcc-s1_12-20220319-1ubuntu1_amd64",
847+
"name": "libgcc-s1",
848+
"version": "12-20220319-1ubuntu1"
849+
},
850+
{
851+
"key": "libgssapi-krb5-2_1.19.2-2_amd64",
852+
"name": "libgssapi-krb5-2",
853+
"version": "1.19.2-2"
854+
},
855+
{
856+
"key": "libk5crypto3_1.19.2-2_amd64",
857+
"name": "libk5crypto3",
858+
"version": "1.19.2-2"
859+
},
860+
{
861+
"key": "libkeyutils1_1.6.1-2ubuntu3_amd64",
862+
"name": "libkeyutils1",
863+
"version": "1.6.1-2ubuntu3"
864+
},
865+
{
866+
"key": "libkrb5-3_1.19.2-2_amd64",
867+
"name": "libkrb5-3",
868+
"version": "1.19.2-2"
869+
},
870+
{
871+
"key": "libkrb5support0_1.19.2-2_amd64",
872+
"name": "libkrb5support0",
873+
"version": "1.19.2-2"
874+
},
875+
{
876+
"key": "liblzma5_5.2.5-2ubuntu1_amd64",
877+
"name": "liblzma5",
878+
"version": "5.2.5-2ubuntu1"
879+
},
880+
{
881+
"key": "libnsl-dev_1.3.0-2build2_amd64",
882+
"name": "libnsl-dev",
883+
"version": "1.3.0-2build2"
884+
},
885+
{
886+
"key": "libnsl2_1.3.0-2build2_amd64",
887+
"name": "libnsl2",
888+
"version": "1.3.0-2build2"
889+
},
890+
{
891+
"key": "libpcre2-8-0_10.39-3build1_amd64",
892+
"name": "libpcre2-8-0",
893+
"version": "10.39-3build1"
894+
},
895+
{
896+
"key": "libselinux1_3.3-1build2_amd64",
897+
"name": "libselinux1",
898+
"version": "3.3-1build2"
899+
},
900+
{
901+
"key": "libssl3_3.0.2-0ubuntu1_amd64",
902+
"name": "libssl3",
903+
"version": "3.0.2-0ubuntu1"
904+
},
905+
{
906+
"key": "libtirpc-common_1.3.2-2build1_amd64",
907+
"name": "libtirpc-common",
908+
"version": "1.3.2-2build1"
909+
},
910+
{
911+
"key": "libtirpc-dev_1.3.2-2build1_amd64",
912+
"name": "libtirpc-dev",
913+
"version": "1.3.2-2build1"
914+
},
915+
{
916+
"key": "libtirpc3_1.3.2-2build1_amd64",
917+
"name": "libtirpc3",
918+
"version": "1.3.2-2build1"
919+
},
920+
{
921+
"key": "libzstd1_1.4.8-p-dfsg-3build1_amd64",
922+
"name": "libzstd1",
923+
"version": "1.4.8+dfsg-3build1"
924+
},
925+
{
926+
"key": "linux-libc-dev_5.15.0-25.25_amd64",
927+
"name": "linux-libc-dev",
928+
"version": "5.15.0-25.25"
929+
},
930+
{
931+
"key": "perl-base_5.34.0-3ubuntu1_amd64",
932+
"name": "perl-base",
933+
"version": "5.34.0-3ubuntu1"
934+
},
935+
{
936+
"key": "rpcsvc-proto_1.4.2-0ubuntu6_amd64",
937+
"name": "rpcsvc-proto",
938+
"version": "1.4.2-0ubuntu6"
939+
},
940+
{
941+
"key": "tar_1.34-p-dfsg-1build3_amd64",
942+
"name": "tar",
943+
"version": "1.34+dfsg-1build3"
944+
},
945+
{
946+
"key": "zlib1g_1-1.2.11.dfsg-2ubuntu9_amd64",
947+
"name": "zlib1g",
948+
"version": "1:1.2.11.dfsg-2ubuntu9"
949+
}
950+
],
951+
"key": "zlib1g-dev_1-1.2.11.dfsg-2ubuntu9_amd64",
952+
"name": "zlib1g-dev",
953+
"sha256": "ddbadadcbfe2669de79eabac36a990f0f1666bb86a87d1a9cd56fd72620ca2db",
954+
"url": "https://snapshot.ubuntu.com/ubuntu/20250219T154000Z/pool/main/z/zlib/zlib1g-dev_1.2.11.dfsg-2ubuntu9_amd64.deb",
955+
"version": "1:1.2.11.dfsg-2ubuntu9"
956+
},
786957
{
787958
"arch": "amd64",
788959
"dependencies": [],

0 commit comments

Comments
 (0)