Skip to content

Commit b25f073

Browse files
committed
add compression to cc
Signed-off-by: Appu Goundan <[email protected]>
1 parent 559bad7 commit b25f073

File tree

3 files changed

+65
-9
lines changed

3 files changed

+65
-9
lines changed

cc/BUILD

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,14 @@ load("//private/util:deb.bzl", "deb")
55

66
package(default_visibility = ["//visibility:public"])
77

8-
GCC_BASE = {
9-
"debian12": "gcc-12-base",
10-
"debian13": "gcc-14-base",
8+
DISTRO_SPECIFIC_LIBRARIES = {
9+
"debian12": [
10+
"gcc-12-base",
11+
],
12+
"debian13": [
13+
"gcc-14-base",
14+
"zlib1g",
15+
],
1116
}
1217

1318
# An image for C/C++ programs
@@ -35,15 +40,10 @@ GCC_BASE = {
3540
name = ("cc" if (not mode) else mode[1:]) + "_" + user + "_" + arch + "_" + distro,
3641
base = "//base" + (mode if mode else ":base") + "_" + user + "_" + arch + "_" + distro,
3742
tars = [
38-
deb.package(
39-
arch,
40-
distro,
41-
GCC_BASE[distro],
42-
),
4343
deb.package(arch, distro, "libgomp1"),
4444
deb.package(arch, distro, "libstdc++6"),
4545
deb.package(arch, distro, "libgcc-s1"),
46-
],
46+
] + [deb.package(arch, distro, library) for library in DISTRO_SPECIFIC_LIBRARIES[distro]],
4747
)
4848
for mode in [
4949
"",

private/repos/deb/trixie.lock.json

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,17 @@
143143
],
144144
"version": "14.2.0-19"
145145
},
146+
{
147+
"arch": "amd64",
148+
"dependencies": [],
149+
"key": "zlib1g_1-1.3.dfsg-p-really1.3.1-1-p-b1_amd64",
150+
"name": "zlib1g",
151+
"sha256": "015be740d6236ad114582dea500c1d907f29e16d6db00566ca32fb68d71ac90d",
152+
"urls": [
153+
"https://snapshot.debian.org/archive/debian/20251001T203719Z/pool/main/z/zlib/zlib1g_1.3.dfsg+really1.3.1-1+b1_amd64.deb"
154+
],
155+
"version": "1:1.3.dfsg+really1.3.1-1+b1"
156+
},
146157
{
147158
"arch": "arm64",
148159
"dependencies": [],
@@ -286,6 +297,17 @@
286297
],
287298
"version": "14.2.0-19"
288299
},
300+
{
301+
"arch": "arm64",
302+
"dependencies": [],
303+
"key": "zlib1g_1-1.3.dfsg-p-really1.3.1-1-p-b1_arm64",
304+
"name": "zlib1g",
305+
"sha256": "209aa5cf671e97b9eb0410844fa6df4cae2e75b0c72e7802ab6c8ece13e6ddef",
306+
"urls": [
307+
"https://snapshot.debian.org/archive/debian/20251001T203719Z/pool/main/z/zlib/zlib1g_1.3.dfsg+really1.3.1-1+b1_arm64.deb"
308+
],
309+
"version": "1:1.3.dfsg+really1.3.1-1+b1"
310+
},
289311
{
290312
"arch": "armhf",
291313
"dependencies": [],
@@ -429,6 +451,17 @@
429451
],
430452
"version": "14.2.0-19"
431453
},
454+
{
455+
"arch": "armhf",
456+
"dependencies": [],
457+
"key": "zlib1g_1-1.3.dfsg-p-really1.3.1-1-p-b1_armhf",
458+
"name": "zlib1g",
459+
"sha256": "81c55a59e1570477ecef6a449bf6dce44dad67ba4ce9e04760451d4cfe200534",
460+
"urls": [
461+
"https://snapshot.debian.org/archive/debian/20251001T203719Z/pool/main/z/zlib/zlib1g_1.3.dfsg+really1.3.1-1+b1_armhf.deb"
462+
],
463+
"version": "1:1.3.dfsg+really1.3.1-1+b1"
464+
},
432465
{
433466
"arch": "s390x",
434467
"dependencies": [],
@@ -572,6 +605,17 @@
572605
],
573606
"version": "14.2.0-19"
574607
},
608+
{
609+
"arch": "s390x",
610+
"dependencies": [],
611+
"key": "zlib1g_1-1.3.dfsg-p-really1.3.1-1-p-b1_s390x",
612+
"name": "zlib1g",
613+
"sha256": "e38a94c60e944dfcf1937a12b02785afbbb2bedf356da18984c4dac0acc47ed9",
614+
"urls": [
615+
"https://snapshot.debian.org/archive/debian/20251001T203719Z/pool/main/z/zlib/zlib1g_1.3.dfsg+really1.3.1-1+b1_s390x.deb"
616+
],
617+
"version": "1:1.3.dfsg+really1.3.1-1+b1"
618+
},
575619
{
576620
"arch": "ppc64el",
577621
"dependencies": [],
@@ -714,6 +758,17 @@
714758
"https://snapshot.debian.org/archive/debian/20251001T203719Z/pool/main/g/gcc-14/libstdc++6_14.2.0-19_ppc64el.deb"
715759
],
716760
"version": "14.2.0-19"
761+
},
762+
{
763+
"arch": "ppc64el",
764+
"dependencies": [],
765+
"key": "zlib1g_1-1.3.dfsg-p-really1.3.1-1-p-b1_ppc64el",
766+
"name": "zlib1g",
767+
"sha256": "f526e830310db11983cf51cfde95a74bc449a7bdc44b6ce68827d78802f1b4ae",
768+
"urls": [
769+
"https://snapshot.debian.org/archive/debian/20251001T203719Z/pool/main/z/zlib/zlib1g_1.3.dfsg+really1.3.1-1+b1_ppc64el.deb"
770+
],
771+
"version": "1:1.3.dfsg+really1.3.1-1+b1"
717772
}
718773
],
719774
"version": 1

private/repos/deb/trixie.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,3 +31,4 @@ packages:
3131
- libgcc-s1
3232
- libgomp1
3333
- libstdc++6
34+
- zlib1g

0 commit comments

Comments
 (0)