8000 jvm ladder: take only the glibc-bedrock-2.42 sysroot, not its whole tarball by bryan-minimal · Pull Request #937 · gominimal/pkgs · GitHub
[go: up one dir, main page]

Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions packages/ant-bootstrap-1.8.4/build.ncl < 8000 clipboard-copy data-copy-feedback="Copied!" aria-label="Copy" value="packages/ant-bootstrap-1.8.4/build.ncl" data-view-component="true" class="Link--onHover color-fg-muted ml-2 tmp-ml-2 mr-2 tmp-mr-2">
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
let { Attrs, BuildSpec, Local, OutputData, Source, .. } = import "minimal.ncl" in
let { subsetOf, Attrs, BuildSpec, Local, OutputData, Source, .. } = import "minimal.ncl" in
let { target, .. } = import "config.ncl" in
# ant-bootstrap-1.8.4: one rung of the JVM ladder (jikes-1.22 -> classpath-0.93 -> jamvm-1.5.1 ->
# ant-bootstrap-1.8.4 -> ecj-bootstrap-3.2.2 -> classpath-0.99 -> classpath-devel -> jamvm-2.0.0
Expand All @@ -14,7 +14,7 @@ let gcc-bedrock = import "../gcc-15.2.0-glibc/build.ncl" in # asserted by build.
# production binutils: the sealed binutils-2.46-glibc shares sonames (libsframe.so.3) with it in
# /usr/lib, and a mixed pair crashes as
let binutils = import "../binutils/build.ncl" in
let glibc-bedrock = import "../glibc-bedrock-2.42/build.ncl" in # sysroot
let glibc-bedrock = subsetOf (import "../glibc-bedrock-2.42/build.ncl") ["sysroot_lib", "sysroot_include"] in # sysroot only: the sealed tarball also carries a whole glibc 2.42 at /usr/lib
let bash = import "../bash/build.ncl" in
let make = import "../make/build.ncl" in
let sed = import "../sed/build.ncl" in
Expand Down
4 changes: 2 additions & 2 deletions packages/classpath-0.93/build.ncl
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
let { Attrs, BuildSpec, Local, OutputData, Source, .. } = import "minimal.ncl" in
let { subsetOf, Attrs, BuildSpec, Local, OutputData, Source, .. } = import "minimal.ncl" in
let { target, .. } = import "config.ncl" in
# classpath-0.93: one rung of the JVM ladder (jikes-1.22 -> classpath-0.93 -> jamvm-1.5.1 ->
# ant-bootstrap-1.8.4 -> ecj-bootstrap-3.2.2 -> classpath-0.99 -> classpath-devel -> jamvm-2.0.0
Expand All @@ -12,7 +12,7 @@ let gcc-bedrock = import "../gcc-15.2.0-glibc/build.ncl" in # asserted by build.
# production binutils: the sealed binutils-2.46-glibc shares sonames (libsframe.so.3) with it in
# /usr/lib, and a mixed pair crashes as
let binutils = import "../binutils/build.ncl" in
let glibc-bedrock = import "../glibc-bedrock-2.42/build.ncl" in # sysroot
let glibc-bedrock = subsetOf (import "../glibc-bedrock-2.42/build.ncl") ["sysroot_lib", "sysroot_include"] in # sysroot only: the sealed tarball also carries a whole glibc 2.42 at /usr/lib
let bash = import "../bash/build.ncl" in
let make = import "../make/build.ncl" in
let sed = import "../sed/build.ncl" in
Expand Down
4 changes: 2 additions & 2 deletions packages/classpath-0.99/build.ncl
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
let { Attrs, BuildSpec, Local, OutputData, Source, .. } = import "minimal.ncl" in
let { subsetOf, Attrs, BuildSpec, Local, OutputData, Source, .. } = import "minimal.ncl" in
let { target, .. } = import "config.ncl" in
# classpath-0.99: one rung of the JVM ladder (jikes-1.22 -> classpath-0.93 -> jamvm-1.5.1 ->
# ant-bootstrap-1.8.4 -> ecj-bootstrap-3.2.2 -> classpath-0.99 -> classpath-devel -> jamvm-2.0.0
Expand All @@ -14,7 +14,7 @@ let gcc-bedrock = import "../gcc-15.2.0-glibc/build.ncl" in # asserted by build.
# production binutils: the sealed binutils-2.46-glibc shares sonames (libsframe.so.3) with it in
# /usr/lib, and a mixed pair crashes as
let binutils = import "../binutils/build.ncl" in
let glibc-bedrock = import "../glibc-bedrock-2.42/build.ncl" in # sysroot
let glibc-bedrock = subsetOf (import "../glibc-bedrock-2.42/build.ncl") ["sysroot_lib", "sysroot_include"] in # sysroot only: the sealed tarball also carries a whole glibc 2.42 at /usr/lib
let bash = import "../bash/build.ncl" in
let make = import "../make/build.ncl" in
let sed = import "../sed/build.ncl" in
Expand Down
4 changes: 2 additions & 2 deletions packages/classpath-devel/build.ncl
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
let { Attrs, BuildSpec, Local, OutputData, Source, .. } = import "minimal.ncl" in
let { subsetOf, Attrs, BuildSpec, Local, OutputData, Source, .. } = import "minimal.ncl" in
let { target, .. } = import "config.ncl" in
# classpath-devel: one rung of the JVM ladder (jikes-1.22 -> classpath-0.93 -> jamvm-1.5.1 ->
# ant-bootstrap-1.8.4 -> ecj-bootstrap-3.2.2 -> classpath-0.99 -> classpath-devel -> jamvm-2.0.0
Expand All @@ -16,7 +16,7 @@ let gcc-bedrock = import "../gcc-15.2.0-glibc/build.ncl" in # asserted by build.
# production binutils: the sealed binutils-2.46-glibc shares sonames (libsframe.so.3) with it in
# /usr/lib, and a mixed pair crashes as
let binutils = import "../binutils/build.ncl" in
let glibc-bedrock = import "../glibc-bedrock-2.42/build.ncl" in # sysroot
let glibc-bedrock = subsetOf (import "../glibc-bedrock-2.42/build.ncl") ["sysroot_lib", "sysroot_include"] in # sysroot only: the sealed tarball also carries a whole glibc 2.42 at /usr/lib
let bash = import "../bash/build.ncl" in
let make = import "../make/build.ncl" in
let sed = import "../sed/build.ncl" in
Expand Down
4 changes: 2 additions & 2 deletions packages/ecj-bootstrap-3.2.2/build.ncl
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
let { Attrs, BuildSpec, Local, OutputData, Source, .. } = import "minimal.ncl" in
let { subsetOf, Attrs, BuildSpec, Local, OutputData, Source, .. } = import "minimal.ncl" in
let { target, .. } = import "config.ncl" in
# ecj-bootstrap-3.2.2: one rung of the JVM ladder (jikes-1.22 -> classpath-0.93 -> jamvm-1.5.1 ->
# ant-bootstrap-1.8.4 -> ecj-bootstrap-3.2.2 -> classpath-0.99 -> classpath-devel -> jamvm-2.0.0
Expand All @@ -16,7 +16,7 @@ let gcc-bedrock = import "../gcc-15.2.0-glibc/build.ncl" in # asserted by build.
# production binutils: the sealed binutils-2.46-glibc shares sonames (libsframe.so.3) with it in
# /usr/lib, and a mixed pair crashes as
let binutils = import "../binutils/build.ncl" in
let glibc-bedrock = import "../glibc-bedrock-2.42/build.ncl" in # sysroot
let glibc-bedrock = subsetOf (import "../glibc-bedrock-2.42/build.ncl") ["sysroot_lib", "sysroot_include"] in # sysroot only: the sealed tarball also carries a whole glibc 2.42 at /usr/lib
let bash = import "../bash/build.ncl" in
let make = import "../make/build.ncl" in
let sed = import "../sed/build.ncl" in
Expand Down
4 changes: 2 additions & 2 deletions packages/ecj4-bootstrap-4.2.1/build.ncl
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
let { Attrs, BuildSpec, Local, OutputData, Source, .. } = import "minimal.ncl" in
let { subsetOf, Attrs, BuildSpec, Local, OutputData, Source, .. } = import "minimal.ncl" in
let { target, .. } = import "config.ncl" in
# ecj4-bootstrap-4.2.1: one rung of the JVM ladder (jikes-1.22 -> classpath-0.93 -> jamvm-1.5.1 ->
# ant-bootstrap-1.8.4 -> ecj-bootstrap-3.2.2 -> classpath-0.99 -> classpath-devel -> jamvm-2.0.0
Expand All @@ -16,7 +16,7 @@ let gcc-bedrock = import "../gcc-15.2.0-glibc/build.ncl" in # asserted by build.
# production binutils: the sealed binutils-2.46-glibc shares sonames (libsframe.so.3) with it in
# /usr/lib, and a mixed pair crashes as
let binutils = import "../binutils/build.ncl" in
let glibc-bedrock = import "../glibc-bedrock-2.42/build.ncl" in # sysroot
let glibc-bedrock = subsetOf (import "../glibc-bedrock-2.42/build.ncl") ["sysroot_lib", "sysroot_include"] in # sysroot only: the sealed tarball also carries a whole glibc 2.42 at /usr/lib
let bash = import "../bash/build.ncl" in
let make = import "../make/build.ncl" in
let sed = import "../sed/build.ncl" in
Expand Down
4 changes: 2 additions & 2 deletions packages/icedtea-7/build.ncl
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
let { Attrs, BuildSpec, Local, OutputData, Source, .. } = import "minimal.ncl" in
let { subsetOf, Attrs, BuildSpec, Local, OutputData, Source, .. } = import "minimal.ncl" in
let { target, .. } = import "config.ncl" in
# icedtea-7: one rung of the JVM ladder (jikes-1.22 -> classpath-0.93 -> jamvm-1.5.1 ->
# ant-bootstrap-1.8.4 -> ecj-bootstrap-3.2.2 -> classpath-0.99 -> classpath-devel -> jamvm-2.0.0
Expand All @@ -16,7 +16,7 @@ let gcc-bedrock = import "../gcc-15.2.0-glibc/build.ncl" in # asserted by build.
# production binutils: the sealed binutils-2.46-glibc shares sonames (libsframe.so.3) with it in
# /usr/lib, and a mixed pair crashes as
let binutils = import "../binutils/build.ncl" in
let glibc-bedrock = import "../glibc-bedrock-2.42/build.ncl" in # sysroot
let glibc-bedrock = subsetOf (import "../glibc-bedrock-2.42/build.ncl") ["sysroot_lib", "sysroot_include"] in # sysroot only: the sealed tarball also carries a whole glibc 2.42 at /usr/lib
let bash = import "../bash/build.ncl" in
let make = import "../make/build.ncl" in
let sed = import "../sed/build.ncl" in
Expand Down
4 changes: 2 additions & 2 deletions packages/icedtea-8/build.ncl
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
let { Attrs, BuildSpec, Local, OutputData, Source, .. } = import "minimal.ncl" in
let { subsetOf, Attrs, BuildSpec, Local, OutputData, Source, .. } = import "minimal.ncl" in
let { target, .. } = import "config.ncl" in
# icedtea-8: one rung of the JVM ladder (jikes-1.22 -> classpath-0.93 -> jamvm-1.5.1 ->
# ant-bootstrap-1.8.4 -> ecj-bootstrap-3.2.2 -> classpath-0.99 -> classpath-devel -> jamvm-2.0.0
Expand All @@ -13,7 +13,7 @@ let gcc-bedrock = import "../gcc-15.2.0-glibc/build.ncl" in # asserted by build.
# production binutils: the sealed binutils-2.46-glibc shares sonames (libsframe.so.3) with it in
# /usr/lib, and a mixed pair crashes as
let binutils = import "../binutils/build.ncl" in
let glibc-bedrock = import "../glibc-bedrock-2.42/build.ncl" in # sysroot
let glibc-bedrock = subsetOf (import "../glibc-bedrock-2.42/build.ncl") ["sysroot_lib", "sysroot_include"] in # sysroot only: the sealed tarball also carries a whole glibc 2.42 at /usr/lib
let bash = import "../bash/build.ncl" in
let make = import "../make/build.ncl" in
let sed = import "../sed/build.ncl" in
Expand Down
4 changes: 2 additions & 2 deletions packages/jamvm-1.5.1/build.ncl
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
let { Attrs, BuildSpec, Local, OutputData, Source, .. } = import "minimal.ncl" in
let { subsetOf, Attrs, BuildSpec, Local, OutputData, Source, .. } = import "minimal.ncl" in
let { target, .. } = import "config.ncl" in
# jamvm-1.5.1: one rung of the JVM ladder (jikes-1.22 -> classpath-0.93 -> jamvm-1.5.1 ->
# ant-bootstrap-1.8.4 -> ecj-bootstrap-3.2.2 -> classpath-0.99 -> classpath-devel -> jamvm-2.0.0
Expand All @@ -13,7 +13,7 @@ let gcc-bedrock = import "../gcc-15.2.0-glibc/build.ncl" in # asserted by build.
# production binutils: the sealed binutils-2.46-glibc shares sonames (libsframe.so.3) with it in
# /usr/lib, and a mixed pair crashes as
let binutils = import "../binutils/build.ncl" in
let glibc-bedrock = import "../glibc-bedrock-2.42/build.ncl" in # sysroot
let glibc-bedrock = subsetOf (import "../glibc-bedrock-2.42/build.ncl") ["sysroot_lib", "sysroot_include"] in # sysroot only: the sealed tarball also carries a whole glibc 2.42 at /usr/lib
let bash = import "../bash/build.ncl" in
let make = import "../make/build.ncl" in
let sed = import "../sed/build.ncl" in
Expand Down
4 changes: 2 additions & 2 deletions packages/jamvm-2.0.0/build.ncl
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
let { Attrs, BuildSpec, Local, OutputData, Source, .. } = import "minimal.ncl" in
let { subsetOf, Attrs, BuildSpec, Local, OutputData, Source, .. } = import "minimal.ncl" in
let { target, .. } = import "config.ncl" in
# jamvm-2.0.0: one rung of the JVM ladder (jikes-1.22 -> classpath-0.93 -> jamvm-1.5.1 ->
# ant-bootstrap-1.8.4 -> ecj-bootstrap-3.2.2 -> classpath-0.99 -> classpath-devel -> jamvm-2.0.0
Expand All @@ -15,7 +15,7 @@ let gcc-bedrock = import "../gcc-15.2.0-glibc/build.ncl" in # asserted by build.
# production binutils: the sealed binutils-2.46-glibc shares sonames (libsframe.so.3) with it in
# /usr/lib, and a mixed pair crashes as
let binutils = import "../binutils/build.ncl" in
let glibc-bedrock = import "../glibc-bedrock-2.42/build.ncl" in # sysroot
let glibc-bedrock = subsetOf (import "../glibc-bedrock-2.42/build.ncl") ["sysroot_lib", "sysroot_include"] in # sysroot only: the sealed tarball also carries a whole glibc 2.42 at /usr/lib
let bash = import "../bash/build.ncl" in
let make = import "../make/build.ncl" in
let sed = import "../sed/build.ncl" in
Expand Down
4 changes: 2 additions & 2 deletions packages/jikes-1.22/build.ncl
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
let { Attrs, BuildSpec, Local, OutputData, Source, .. } = import "minimal.ncl" in
let { subsetOf, Attrs, BuildSpec, Local, OutputData, Source, .. } = import "minimal.ncl" in
let { target, .. } = import "config.ncl" in
# jikes-1.22: the ROOT of the JVM ladder (jikes-1.22 -> classpath-0.93 -> jamvm-1.5.1 ->
# ant-bootstrap-1.8.4 -> ecj-bootstrap-3.2.2 -> classpath-0.99 -> classpath-devel -> jamvm-2.0.0
Expand All @@ -14,7 +14,7 @@ let gcc-bedrock = import "../gcc-15.2.0-glibc/build.ncl" in # B5 seed-rooted gcc
# production binutils: the sealed binutils-2.46-glibc shares sonames (libsframe.so.3) with it in
# /usr/lib, and a mixed pair crashes as
let binutils = import "../binutils/build.ncl" in
let glibc-bedrock = import "../glibc-bedrock-2.42/build.ncl" in # B4 sysroot
let glibc-bedrock = subsetOf (import "../glibc-bedrock-2.42/build.ncl") ["sysroot_lib", "sysroot_include"] in # B4 sysroot only: the sealed tarball also carries a whole glibc 2.42 at /usr/lib
let bash = import "../bash/build.ncl" in
let make = import "../make/build.ncl" in
let sed = import "../sed/build.ncl" in
Expand Down
4 changes: 2 additions & 2 deletions packages/openjdk-10/build.ncl
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
let { Attrs, BuildSpec, Local, OutputData, Source, .. } = import "minimal.ncl" in
let { subsetOf, Attrs, BuildSpec, Local, OutputData, Source, .. } = import "minimal.ncl" in
let { target, .. } = import "config.ncl" in
# openjdk-10: one rung of the JVM ladder (jikes-1.22 -> classpath-0.93 -> jamvm-1.5.1 ->
# ant-bootstrap-1.8.4 -> ecj-bootstrap-3.2.2 -> classpath-0.99 -> classpath-devel -> jamvm-2.0.0
Expand All @@ -13,7 +13,7 @@ let gcc-bedrock = import "../gcc-15.2.0-glibc/build.ncl" in # asserted by build.
# production binutils: the sealed binutils-2.46-glibc shares sonames (libsframe.so.3) with it in
# /usr/lib, and a mixed pair crashes as
let binutils = import "../binutils/build.ncl" in
let glibc-bedrock = import "../glibc-bedrock-2.42/build.ncl" in # sysroot
let glibc-bedrock = subsetOf (import "../glibc-bedrock-2.42/build.ncl") ["sysroot_lib", "sysroot_include"] in # sysroot only: the sealed tarball also carries a whole glibc 2.42 at /usr/lib
let bash = import "../bash/build.ncl" in
let make = import "../make/build.ncl" in
let sed = import "../sed/build.ncl" in
Expand Down
4 changes: 2 additions & 2 deletions packages/openjdk-11/build.ncl
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
let { Attrs, BuildSpec, Local, OutputData, Source, .. } = import "minimal.ncl" in
let { subsetOf, Attrs, BuildSpec, Local, OutputData, Source, .. } = import "minimal.ncl" in
let { target, .. } = import "config.ncl" in
# openjdk-11: one rung of the JVM ladder (jikes-1.22 -> classpath-0.93 -> jamvm-1.5.1 ->
# ant-bootstrap-1.8.4 -> ecj-bootstrap-3.2.2 -> classpath-0.99 -> classpath-devel -> jamvm-2.0.0
Expand All @@ -12,7 +12,7 @@ let gcc-bedrock = import "../gcc-15.2.0-glibc/build.ncl" in # asserted by build.
# production binutils: the sealed binutils-2.46-glibc shares sonames (libsframe.so.3) with it in
# /usr/lib, and a mixed pair crashes as
let binutils = import "../binutils/build.ncl" in
let glibc-bedrock = import "../glibc-bedrock-2.42/build.ncl" in # sysroot
let glibc-bedrock = subsetOf (import "../glibc-bedrock-2.42/build.ncl") ["sysroot_lib", "sysroot_include"] in # sysroot only: the sealed tarball also carries a whole glibc 2.42 at /usr/lib
let bash = import "../bash/build.ncl" in
let make = import "../make/build.ncl" in
let sed = import "../sed/build.ncl" in
Expand Down
4 changes: 2 additions & 2 deletions packages/openjdk-12/build.ncl
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
let { Attrs, BuildSpec, Local, OutputData, Source, .. } = import "minimal.ncl" in
let { subsetOf, Attrs, BuildSpec, Local, OutputData, Source, .. } = import "minimal.ncl" in
let { target, .. } = import "config.ncl" in
# openjdk-12: one rung of the JVM ladder (jikes-1.22 -> classpath-0.93 -> jamvm-1.5.1 ->
# ant-bootstrap-1.8.4 -> ecj-bootstrap-3.2.2 -> classpath-0.99 -> classpath-devel -> jamvm-2.0.0
Expand All @@ -12,7 +12,7 @@ let gcc-bedrock = import "../gcc-15.2.0-glibc/build.ncl" in # asserted by build.
# production binutils: the sealed binutils-2.46-glibc shares sonames (libsframe.so.3) with it in
# /usr/lib, and a mixed pair crashes as
let binutils = import "../binutils/build.ncl" in
let glibc-bedrock = import "../glibc-bedrock-2.42/build.ncl" in # sysroot
let glibc-bedrock = subsetOf (import "../glibc-bedrock-2.42/build.ncl") ["sysroot_lib", "sysroot_include"] in # sysroot only: the sealed tarball also carries a whole glibc 2.42 at /usr/lib
let bash = import "../bash/build.ncl" in
let make = import "../make/build.ncl" in
let sed = import "../sed/build.ncl" in
Expand Down
4 changes: 2 additions & 2 deletions packages/openjdk-13/build.ncl
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
let { Attrs, BuildSpec, Local, OutputData, Source, .. } = import "minimal.ncl" in
let { subsetOf, Attrs, BuildSpec, Local, OutputData, Source, .. } = import "minimal.ncl" in
let { target, .. } = import "config.ncl" in
# openjdk-13: one rung of the JVM ladder (jikes-1.22 -> classpath-0.93 -> jamvm-1.5.1 ->
# ant-bootstrap-1.8.4 -> ecj-bootstrap-3.2.2 -> classpath-0.99 -> classpath-devel -> jamvm-2.0.0
Expand All @@ -12,7 +12,7 @@ let gcc-bedrock = import "../gcc-15.2.0-glibc/build.ncl" in # asserted by build.
# production binutils: the sealed binutils-2.46-glibc shares sonames (libsframe.so.3) with it in
# /usr/lib, and a mixed pair crashes as
let binutils = import "../binutils/build.ncl" in
let glibc-bedrock = import "../glibc-bedrock-2.42/build.ncl" in # sysroot
let glibc-bedrock = subsetOf (import "../glibc-bedrock-2.42/build.ncl") ["sysroot_lib", "sysroot_include"] in # sysroot only: the sealed tarball also carries a whole glibc 2.42 at /usr/lib
let bash = import "../bash/build.ncl" in
let make = import "../make/build.ncl" in
let sed = import "../sed/build.ncl" in
Expand Down
4 changes: 2 additions & 2 deletions packages/openjdk-14/build.ncl
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
let { Attrs, BuildSpec, Local, OutputData, Source, .. } = import "minimal.ncl" in
let { subsetOf, Attrs, BuildSpec, Local, OutputData, Source, .. } = import "minimal.ncl" in
let { target, .. } = import "config.ncl" in
# openjdk-14: one rung of the JVM ladder (jikes-1.22 -> classpath-0.93 -> jamvm-1.5.1 ->
# ant-bootstrap-1.8.4 -> ecj-bootstrap-3.2.2 -> classpath-0.99 -> classpath-devel -> jamvm-2.0.0
Expand All @@ -12,7 +12,7 @@ let gcc-bedrock = import "../gcc-15.2.0-glibc/build.ncl" in # asserted by build.
# production binutils: the sealed binutils-2.46-glibc shares sonames (libsframe.so.3) with it in
# /usr/lib, and a mixed pair crashes as
let binutils = import "../binutils/build.ncl" in
let glibc-bedrock = import "../glibc-bedrock-2.42/build.ncl" in # sysroot
let glibc-bedrock = subsetOf (import "../glibc-bedrock-2.42/build.ncl") ["sysroot_lib", "sysroot_include"] in # sysroot only: the sealed tarball also carries a whole glibc 2.42 at /usr/lib
let bash = import "../bash/build.ncl" in
let make = import "../make/build.ncl" in
let sed = import "../sed/build.ncl" in
Expand Down
4 changes: 2 additions & 2 deletions packages/openjdk-15/build.ncl
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
let { Attrs, BuildSpec, Local, OutputData, Source, .. } = import "minimal.ncl" in
let { subsetOf, Attrs, BuildSpec, Local, OutputData, Source, .. } = import "minimal.ncl" in
let { target, .. } = import "config.ncl" in
# openjdk-15: one rung of the JVM ladder (jikes-1.22 -> classpath-0.93 -> jamvm-1.5.1 ->
# ant-bootstrap-1.8.4 -> ecj-bootstrap-3.2.2 -> classpath-0.99 -> classpath-devel -> jamvm-2.0.0
Expand All @@ -12,7 +12,7 @@ let gcc-bedrock = import "../gcc-15.2.0-glibc/build.ncl" in # asserted by build.
# production binutils: the sealed binutils-2.46-glibc shares sonames (libsframe.so.3) with it in
# /usr/lib, and a mixed pair crashes as
let binutils = import "../binutils/build.ncl" in
let glibc-bedrock = import "../glibc-bedrock-2.42/build.ncl" in # sysroot
let glibc-bedrock = subsetOf (import "../glibc-bedrock-2.42/build.ncl") ["sysroot_lib", "sysroot_include"] in # sysroot only: the sealed tarball also carries a whole glibc 2.42 at /usr/lib
let bash = import "../bash/build.ncl" in
let make = import "../make/build.ncl" in
let sed = import "../sed/build.ncl" in
Expand Down
4 changes: 2 additions & 2 deletions packages/openjdk-16/build.ncl
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
let { Attrs, BuildSpec, Local, OutputData, Source, .. } = import "minimal.ncl" in
let { subsetOf, Attrs, BuildSpec, Local, OutputData, Source, .. } = import "minimal.ncl" in
let { target, .. } = import "config.ncl" in
# openjdk-16: one rung of the JVM ladder (jikes-1.22 -> classpath-0.93 -> jamvm-1.5.1 ->
# ant-bootstrap-1.8.4 -> ecj-bootstrap-3.2.2 -> classpath-0.99 -> classpath-devel -> jamvm-2.0.0
Expand All @@ -12,7 +12,7 @@ let gcc-bedrock = import "../gcc-15.2.0-glibc/build.ncl" in # asserted by build.
# production binutils: the sealed binutils-2.46-glibc shares sonames (libsframe.so.3) with it in
# /usr/lib, and a mixed pair crashes as
let binutils = import "../binutils/build.ncl" in
let glibc-bedrock = import "../glibc-bedrock-2.42/build.ncl" in # sysroot
let glibc-bedrock = subsetOf (import "../glibc-bedrock-2.42/build.ncl") ["sysroot_lib", "sysroot_include"] in # sysroot only: the sealed tarball also carries a whole glibc 2.42 at /usr/lib
let bash = import "../bash/build.ncl" in
let make = import "../make/build.ncl" in
let sed = import "../sed/build.ncl" in
Expand Down
Loading
Loading
0