2021-04-19 19:44:10 +01:00
|
|
|
{ pkgspath ? ../../.., test-pkgspath ? pkgspath
|
stdenvBootstrapTools: inherit {cross,local}System
It's expected that attributes in the top-level package set will all use
that package set, but this wasn't the case for the bootstrap tools.
This led some very confusing behaviour:
- pkgsMusl.stdenvBootstrapTools would build glibc bootstrap tools
- stdenvBootstrapTools was _always_ cross compiled, even if
Nixpkgs wasn't, because it always set crossSystem. This also didn't
match the behaviour of using make-bootstrap-tools.nix as an
entrypoint, where crossSystem would default to null.
For the Linux stdenv, I've made the ideal fix, which is to make pkgs an
argument rather than taking the arguments for pkgs, and then
re-importing it. This means it'll always use exactly the same package
set that's calling it, and should also mean faster eval due to not
importing Nixpkgs twice.
The Darwin stdenv is more complicated, and I'm not able to easily test
it, so I wasn't confident in making the same fix there. Instead, I've
just made sure crossSystem and localSystem are set to the correct values
so they're not always cross compiled and match the parent package set's.
It would still be preferable if somebody could make Darwin's
make-bootstrap-tools.nix take pkgs as an argument, rather than all the
arguments for pkgs.
2022-05-30 15:16:22 +01:00
|
|
|
, localSystem ? { system = builtins.currentSystem; }
|
|
|
|
, crossSystem ? null
|
|
|
|
, bootstrapFiles ? null
|
2021-04-19 19:44:10 +01:00
|
|
|
}:
|
2015-02-18 05:24:16 +00:00
|
|
|
|
2021-04-19 19:44:10 +01:00
|
|
|
let cross = if crossSystem != null
|
|
|
|
then { inherit crossSystem; }
|
|
|
|
else {};
|
|
|
|
custom-bootstrap = if bootstrapFiles != null
|
|
|
|
then { stdenvStages = args:
|
|
|
|
let args' = args // { bootstrapFiles = bootstrapFiles; };
|
|
|
|
in (import "${pkgspath}/pkgs/stdenv/darwin" args').stagesDarwin;
|
|
|
|
}
|
|
|
|
else {};
|
stdenvBootstrapTools: inherit {cross,local}System
It's expected that attributes in the top-level package set will all use
that package set, but this wasn't the case for the bootstrap tools.
This led some very confusing behaviour:
- pkgsMusl.stdenvBootstrapTools would build glibc bootstrap tools
- stdenvBootstrapTools was _always_ cross compiled, even if
Nixpkgs wasn't, because it always set crossSystem. This also didn't
match the behaviour of using make-bootstrap-tools.nix as an
entrypoint, where crossSystem would default to null.
For the Linux stdenv, I've made the ideal fix, which is to make pkgs an
argument rather than taking the arguments for pkgs, and then
re-importing it. This means it'll always use exactly the same package
set that's calling it, and should also mean faster eval due to not
importing Nixpkgs twice.
The Darwin stdenv is more complicated, and I'm not able to easily test
it, so I wasn't confident in making the same fix there. Instead, I've
just made sure crossSystem and localSystem are set to the correct values
so they're not always cross compiled and match the parent package set's.
It would still be preferable if somebody could make Darwin's
make-bootstrap-tools.nix take pkgs as an argument, rather than all the
arguments for pkgs.
2022-05-30 15:16:22 +01:00
|
|
|
in with import pkgspath ({ inherit localSystem; } // cross // custom-bootstrap);
|
2015-02-18 05:24:16 +00:00
|
|
|
|
2016-10-14 03:32:12 +01:00
|
|
|
let
|
2021-04-13 18:22:29 +01:00
|
|
|
llvmPackages = llvmPackages_11;
|
2020-11-19 08:28:00 +00:00
|
|
|
storePrefixLen = builtins.stringLength builtins.storeDir;
|
2016-10-14 03:32:12 +01:00
|
|
|
in rec {
|
2016-06-28 08:48:56 +01:00
|
|
|
coreutils_ = coreutils.override (args: {
|
|
|
|
# We want coreutils without ACL support.
|
2015-02-18 05:24:16 +00:00
|
|
|
aclSupport = false;
|
2016-07-09 15:23:43 +01:00
|
|
|
# Cannot use a single binary build, or it gets dynamically linked against gmp.
|
2016-07-09 15:19:18 +01:00
|
|
|
singleBinary = false;
|
2015-02-18 05:24:16 +00:00
|
|
|
});
|
|
|
|
|
2019-06-16 20:59:06 +01:00
|
|
|
cctools_ = darwin.cctools;
|
2018-09-15 21:49:44 +01:00
|
|
|
|
2016-07-03 15:33:26 +01:00
|
|
|
# Avoid debugging larger changes for now.
|
|
|
|
bzip2_ = bzip2.override (args: { linkStatic = true; });
|
|
|
|
|
2018-02-10 18:20:44 +00:00
|
|
|
# Avoid messing with libkrb5 and libnghttp2.
|
2021-03-18 19:27:49 +00:00
|
|
|
curl_ = curlMinimal.override (args: { gssSupport = false; http2Support = false; });
|
2017-12-24 10:09:24 +00:00
|
|
|
|
2015-02-18 05:24:16 +00:00
|
|
|
build = stdenv.mkDerivation {
|
2015-10-23 12:04:10 +01:00
|
|
|
name = "stdenv-bootstrap-tools";
|
2015-02-18 05:24:16 +00:00
|
|
|
|
2020-11-19 08:28:00 +00:00
|
|
|
nativeBuildInputs = [ buildPackages.nukeReferences buildPackages.cpio ]
|
|
|
|
++ lib.optionals targetPlatform.isAarch64 [ buildPackages.darwin.sigtool ];
|
2015-02-18 05:24:16 +00:00
|
|
|
|
|
|
|
buildCommand = ''
|
2020-11-19 08:28:00 +00:00
|
|
|
mkdir -p $out/bin $out/lib $out/lib/system $out/lib/darwin
|
2015-02-18 05:24:16 +00:00
|
|
|
|
2020-11-19 08:28:00 +00:00
|
|
|
${lib.optionalString stdenv.targetPlatform.isx86_64 ''
|
|
|
|
# Copy libSystem's .o files for various low-level boot stuff.
|
2021-06-01 19:26:42 +01:00
|
|
|
cp -d ${lib.getLib darwin.Libsystem}/lib/*.o $out/lib
|
2015-02-18 05:24:16 +00:00
|
|
|
|
2020-11-19 08:28:00 +00:00
|
|
|
# Resolv is actually a link to another package, so let's copy it properly
|
2021-06-01 19:26:42 +01:00
|
|
|
cp -L ${lib.getLib darwin.Libsystem}/lib/libresolv.9.dylib $out/lib
|
2015-02-18 05:24:16 +00:00
|
|
|
|
2021-04-21 17:34:13 +01:00
|
|
|
cp -rL ${darwin.Libsystem}/include $out
|
2020-11-19 08:28:00 +00:00
|
|
|
chmod -R u+w $out/include
|
|
|
|
cp -rL ${darwin.ICU}/include* $out/include
|
|
|
|
cp -rL ${libiconv}/include/* $out/include
|
|
|
|
cp -rL ${gnugrep.pcre.dev}/include/* $out/include
|
|
|
|
mv $out/include $out/include-Libsystem
|
|
|
|
''}
|
2015-02-18 05:24:16 +00:00
|
|
|
|
|
|
|
# Copy coreutils, bash, etc.
|
|
|
|
cp ${coreutils_}/bin/* $out/bin
|
|
|
|
(cd $out/bin && rm vdir dir sha*sum pinky factor pathchk runcon shuf who whoami shred users)
|
|
|
|
|
|
|
|
cp ${bash}/bin/bash $out/bin
|
|
|
|
cp ${findutils}/bin/find $out/bin
|
|
|
|
cp ${findutils}/bin/xargs $out/bin
|
|
|
|
cp -d ${diffutils}/bin/* $out/bin
|
|
|
|
cp -d ${gnused}/bin/* $out/bin
|
|
|
|
cp -d ${gnugrep}/bin/grep $out/bin
|
|
|
|
cp ${gawk}/bin/gawk $out/bin
|
|
|
|
cp -d ${gawk}/bin/awk $out/bin
|
|
|
|
cp ${gnutar}/bin/tar $out/bin
|
|
|
|
cp ${gzip}/bin/gzip $out/bin
|
2016-07-03 15:33:26 +01:00
|
|
|
cp ${bzip2_.bin}/bin/bzip2 $out/bin
|
2015-02-18 05:24:16 +00:00
|
|
|
cp -d ${gnumake}/bin/* $out/bin
|
|
|
|
cp -d ${patch}/bin/* $out/bin
|
2015-10-05 18:25:49 +01:00
|
|
|
cp -d ${xz.bin}/bin/xz $out/bin
|
2015-02-18 05:24:16 +00:00
|
|
|
|
|
|
|
# This used to be in-nixpkgs, but now is in the bundle
|
|
|
|
# because I can't be bothered to make it partially static
|
2017-12-24 10:09:24 +00:00
|
|
|
cp ${curl_.bin}/bin/curl $out/bin
|
|
|
|
cp -d ${curl_.out}/lib/libcurl*.dylib $out/lib
|
2015-10-06 14:32:17 +01:00
|
|
|
cp -d ${libssh2.out}/lib/libssh*.dylib $out/lib
|
treewide: use lib.getLib for OpenSSL libraries
At some point, I'd like to make another attempt at
71f1f4884b5 ("openssl: stop static binaries referencing libs"), which
was reverted in 195c7da07df. One problem with my previous attempt is
that I moved OpenSSL's libraries to a lib output, but many dependent
packages were hardcoding the out output as the location of the
libraries. This patch fixes every such case I could find in the tree.
It won't have any effect immediately, but will mean these packages
will automatically use an OpenSSL lib output if it is reintroduced in
future.
This patch should cause very few rebuilds, because it shouldn't make
any change at all to most packages I'm touching. The few rebuilds
that are introduced come from when I've changed a package builder not
to use variable names like openssl.out in scripts / substitution
patterns, which would be confusing since they don't hardcode the
output any more.
I started by making the following global replacements:
${pkgs.openssl.out}/lib -> ${lib.getLib pkgs.openssl}/lib
${openssl.out}/lib -> ${lib.getLib openssl}/lib
Then I removed the ".out" suffix when part of the argument to
lib.makeLibraryPath, since that function uses lib.getLib internally.
Then I fixed up cases where openssl was part of the -L flag to the
compiler/linker, since that unambigously is referring to libraries.
Then I manually investigated and fixed the following packages:
- pycurl
- citrix-workspace
- ppp
- wraith
- unbound
- gambit
- acl2
I'm reasonably confindent in my fixes for all of them.
For acl2, since the openssl library paths are manually provided above
anyway, I don't think openssl is required separately as a build input
at all. Removing it doesn't make a difference to the output size, the
file list, or the closure.
I've tested evaluation with the OfBorg meta checks, to protect against
introducing evaluation failures.
2022-03-25 15:33:21 +00:00
|
|
|
cp -d ${lib.getLib openssl}/lib/*.dylib $out/lib
|
2015-02-18 05:24:16 +00:00
|
|
|
|
2015-10-05 18:25:49 +01:00
|
|
|
cp -d ${gnugrep.pcre.out}/lib/libpcre*.dylib $out/lib
|
2016-04-14 17:00:39 +01:00
|
|
|
cp -d ${lib.getLib libiconv}/lib/lib*.dylib $out/lib
|
2021-06-01 19:26:42 +01:00
|
|
|
cp -d ${lib.getLib gettext}/lib/libintl*.dylib $out/lib
|
2015-06-18 18:03:32 +01:00
|
|
|
chmod +x $out/lib/libintl*.dylib
|
2016-02-01 17:16:50 +00:00
|
|
|
cp -d ${ncurses.out}/lib/libncurses*.dylib $out/lib
|
2018-09-09 18:36:05 +01:00
|
|
|
cp -d ${libxml2.out}/lib/libxml2*.dylib $out/lib
|
2015-02-18 05:24:16 +00:00
|
|
|
|
|
|
|
# Copy what we need of clang
|
2019-04-23 02:19:51 +01:00
|
|
|
cp -d ${llvmPackages.clang-unwrapped}/bin/clang* $out/bin
|
2021-06-01 19:26:42 +01:00
|
|
|
cp -rd ${lib.getLib llvmPackages.clang-unwrapped}/lib/* $out/lib
|
2015-02-18 05:24:16 +00:00
|
|
|
|
2021-06-01 19:26:42 +01:00
|
|
|
cp -d ${lib.getLib llvmPackages.libcxx}/lib/libc++*.dylib $out/lib
|
|
|
|
cp -d ${lib.getLib llvmPackages.libcxxabi}/lib/libc++abi*.dylib $out/lib
|
|
|
|
cp -d ${lib.getLib llvmPackages.compiler-rt}/lib/darwin/libclang_rt* $out/lib/darwin
|
|
|
|
cp -d ${lib.getLib llvmPackages.compiler-rt}/lib/libclang_rt* $out/lib
|
|
|
|
cp -d ${lib.getLib llvmPackages.llvm.lib}/lib/libLLVM.dylib $out/lib
|
|
|
|
cp -d ${lib.getLib libffi}/lib/libffi*.dylib $out/lib
|
2015-02-18 05:24:16 +00:00
|
|
|
|
|
|
|
mkdir $out/include
|
llvmPackages: Multuple outputs for everythting
Also begin to start work on cross compilation, though that will have to
be finished later.
The patches are based on the first version of
https://reviews.llvm.org/D99484. It's very annoying to do the
back-porting but the review has uncovered nothing super major so I'm
fine sticking with what I've got.
Beyond making the outputs work, I also strove to re-sync the packages,
as they have been drifting pointlessly apart for some time.
----
Other misc notes, highly incomplete
- lvm-config-native and llvm-config are put in `dev` because they are
tools just for build time.
- Clang no longer has an lld dep. That was introduced in
db29857eb391ed002046090851a44c452b80bdbd, but if clang needs help
finding lld when it is used we should just pass it flags / put in the
resource dir. Providing it at build time increases critical path
length for no good reason.
----
A note on `nativeCC`:
`stdenv` takes tools from the previous stage, so:
1. `pkgsBuildBuild`: `(?1, x, x)`
2. `pkgsBuildBuild.stdenv.cc`: `(?0, ?1, x)`
while:
1. `pkgsBuildBuild`: `(?1, x, x)`
2. `pkgsBuildBuild.targetPackages`: `(x, x, ?2)`
3. `pkgsBuildBuild.targetPackages.stdenv.cc`: `(?1, x, x)`
2020-10-15 09:23:57 +01:00
|
|
|
cp -rd ${llvmPackages.libcxx.dev}/include/c++ $out/include
|
2015-02-18 05:24:16 +00:00
|
|
|
|
2022-07-15 02:07:28 +01:00
|
|
|
# copy .tbd assembly utils
|
|
|
|
cp -d ${pkgs.darwin.rewrite-tbd}/bin/rewrite-tbd $out/bin
|
|
|
|
cp -d ${lib.getLib pkgs.libyaml}/lib/libyaml*.dylib $out/lib
|
2020-11-19 08:28:00 +00:00
|
|
|
|
2022-07-15 02:07:28 +01:00
|
|
|
# copy package extraction tools
|
|
|
|
cp -d ${pkgs.pbzx}/bin/pbzx $out/bin
|
|
|
|
cp -d ${lib.getLib pkgs.xar}/lib/libxar*.dylib $out/lib
|
|
|
|
cp -d ${pkgs.bzip2.out}/lib/libbz2*.dylib $out/lib
|
2020-11-19 08:28:00 +00:00
|
|
|
|
2022-07-15 02:07:28 +01:00
|
|
|
${lib.optionalString targetPlatform.isAarch64 ''
|
2020-11-19 08:28:00 +00:00
|
|
|
# copy sigtool
|
|
|
|
cp -d ${pkgs.darwin.sigtool}/bin/sigtool $out/bin
|
|
|
|
cp -d ${pkgs.darwin.sigtool}/bin/codesign $out/bin
|
|
|
|
''}
|
|
|
|
|
2021-06-01 19:26:42 +01:00
|
|
|
cp -d ${lib.getLib darwin.ICU}/lib/libicu*.dylib $out/lib
|
2015-10-05 18:25:49 +01:00
|
|
|
cp -d ${zlib.out}/lib/libz.* $out/lib
|
2016-01-19 08:55:31 +00:00
|
|
|
cp -d ${gmpxx.out}/lib/libgmp*.* $out/lib
|
2015-10-05 18:25:49 +01:00
|
|
|
cp -d ${xz.out}/lib/liblzma*.* $out/lib
|
2015-02-18 05:24:16 +00:00
|
|
|
|
|
|
|
# Copy binutils.
|
2020-11-19 08:28:00 +00:00
|
|
|
for i in as ld ar ranlib nm strip otool install_name_tool lipo codesign_allocate; do
|
2018-09-15 21:49:44 +01:00
|
|
|
cp ${cctools_}/bin/$i $out/bin
|
2015-02-18 05:24:16 +00:00
|
|
|
done
|
|
|
|
|
2021-06-01 19:26:42 +01:00
|
|
|
cp -d ${lib.getLib darwin.libtapi}/lib/libtapi* $out/lib
|
2020-07-25 07:26:54 +01:00
|
|
|
|
2020-11-19 08:28:00 +00:00
|
|
|
${lib.optionalString targetPlatform.isx86_64 ''
|
|
|
|
cp -rd ${pkgs.darwin.CF}/Library $out
|
|
|
|
''}
|
2015-02-18 05:24:16 +00:00
|
|
|
|
|
|
|
chmod -R u+w $out
|
|
|
|
|
|
|
|
nuke-refs $out/bin/*
|
|
|
|
|
|
|
|
rpathify() {
|
2020-11-19 08:28:00 +00:00
|
|
|
local libs=$(${stdenv.cc.targetPrefix}otool -L "$1" | tail -n +2 | grep -o "$NIX_STORE.*-\S*") || true
|
|
|
|
local newlib
|
2015-02-18 05:24:16 +00:00
|
|
|
for lib in $libs; do
|
2021-05-24 06:15:09 +01:00
|
|
|
${stdenv.cc.targetPrefix}install_name_tool -change $lib "@rpath/$(basename "$lib")" "$1"
|
2015-02-18 05:24:16 +00:00
|
|
|
done
|
|
|
|
}
|
|
|
|
|
|
|
|
# Strip executables even further
|
|
|
|
for i in $out/bin/*; do
|
|
|
|
if test -x $i -a ! -L $i; then
|
|
|
|
chmod +w $i
|
2020-11-19 08:28:00 +00:00
|
|
|
${stdenv.cc.targetPrefix}strip $i || true
|
2015-02-18 05:24:16 +00:00
|
|
|
fi
|
|
|
|
done
|
|
|
|
|
2020-11-19 08:28:00 +00:00
|
|
|
for i in $out/bin/* $out/lib/*.dylib $out/lib/darwin/*.dylib $out/Library/Frameworks/CoreFoundation.framework/Versions/A/CoreFoundation; do
|
2016-10-14 03:32:12 +01:00
|
|
|
if test -x "$i" -a ! -L "$i"; then
|
2015-02-18 05:24:16 +00:00
|
|
|
echo "Adding rpath to $i"
|
|
|
|
rpathify $i
|
|
|
|
fi
|
|
|
|
done
|
|
|
|
|
2020-11-19 08:28:00 +00:00
|
|
|
for i in $out/bin/*; do
|
2021-09-23 16:14:07 +01:00
|
|
|
if test -x "$i" -a ! -L "$i"; then
|
2020-11-19 08:28:00 +00:00
|
|
|
echo "Adding @executable_path to rpath in $i"
|
2021-05-24 06:15:09 +01:00
|
|
|
${stdenv.cc.targetPrefix}install_name_tool -add_rpath '@executable_path/../lib' $i
|
2020-11-19 08:28:00 +00:00
|
|
|
fi
|
|
|
|
done
|
|
|
|
|
2015-02-18 05:24:16 +00:00
|
|
|
nuke-refs $out/lib/*
|
2016-10-14 03:32:12 +01:00
|
|
|
nuke-refs $out/lib/system/*
|
2020-11-19 08:28:00 +00:00
|
|
|
nuke-refs $out/lib/darwin/*
|
2015-02-18 05:24:16 +00:00
|
|
|
nuke-refs $out/Library/Frameworks/CoreFoundation.framework/Versions/A/CoreFoundation
|
|
|
|
|
|
|
|
mkdir $out/.pack
|
|
|
|
mv $out/* $out/.pack
|
|
|
|
mv $out/.pack $out/pack
|
|
|
|
|
|
|
|
mkdir $out/on-server
|
2015-10-23 12:04:10 +01:00
|
|
|
cp ${stdenv.shell} $out/on-server/sh
|
|
|
|
cp ${cpio}/bin/cpio $out/on-server
|
|
|
|
cp ${coreutils_}/bin/mkdir $out/on-server
|
2016-07-03 15:33:26 +01:00
|
|
|
cp ${bzip2_.bin}/bin/bzip2 $out/on-server
|
2015-02-18 05:24:16 +00:00
|
|
|
|
2015-10-23 12:04:10 +01:00
|
|
|
chmod u+w $out/on-server/*
|
2020-11-19 08:28:00 +00:00
|
|
|
${stdenv.cc.targetPrefix}strip $out/on-server/*
|
2015-10-23 12:04:10 +01:00
|
|
|
nuke-refs $out/on-server/*
|
2015-02-18 05:24:16 +00:00
|
|
|
|
2015-10-23 12:04:10 +01:00
|
|
|
(cd $out/pack && (find | cpio -o -H newc)) | bzip2 > $out/on-server/bootstrap-tools.cpio.bz2
|
2015-02-18 05:24:16 +00:00
|
|
|
'';
|
|
|
|
|
|
|
|
allowedReferences = [];
|
2015-12-28 21:59:24 +00:00
|
|
|
|
|
|
|
meta = {
|
2021-01-15 07:11:03 +00:00
|
|
|
maintainers = [ lib.maintainers.copumpkin ];
|
2015-12-28 21:59:24 +00:00
|
|
|
};
|
2015-02-18 05:24:16 +00:00
|
|
|
};
|
|
|
|
|
2015-10-23 12:04:10 +01:00
|
|
|
dist = stdenv.mkDerivation {
|
|
|
|
name = "stdenv-bootstrap-tools";
|
2015-02-18 05:24:16 +00:00
|
|
|
|
|
|
|
buildCommand = ''
|
|
|
|
mkdir -p $out/nix-support
|
2015-10-23 12:04:10 +01:00
|
|
|
echo "file tarball ${build}/on-server/bootstrap-tools.cpio.bz2" >> $out/nix-support/hydra-build-products
|
|
|
|
echo "file sh ${build}/on-server/sh" >> $out/nix-support/hydra-build-products
|
|
|
|
echo "file cpio ${build}/on-server/cpio" >> $out/nix-support/hydra-build-products
|
|
|
|
echo "file mkdir ${build}/on-server/mkdir" >> $out/nix-support/hydra-build-products
|
|
|
|
echo "file bzip2 ${build}/on-server/bzip2" >> $out/nix-support/hydra-build-products
|
2015-02-18 05:24:16 +00:00
|
|
|
'';
|
2015-06-18 18:03:32 +01:00
|
|
|
};
|
2015-02-18 05:24:16 +00:00
|
|
|
|
2021-06-13 09:19:02 +01:00
|
|
|
bootstrapLlvmVersion = llvmPackages.llvm.version;
|
|
|
|
|
2016-01-04 02:47:09 +00:00
|
|
|
bootstrapFiles = {
|
|
|
|
sh = "${build}/on-server/sh";
|
|
|
|
bzip2 = "${build}/on-server/bzip2";
|
|
|
|
mkdir = "${build}/on-server/mkdir";
|
|
|
|
cpio = "${build}/on-server/cpio";
|
|
|
|
tarball = "${build}/on-server/bootstrap-tools.cpio.bz2";
|
2015-02-18 05:24:16 +00:00
|
|
|
};
|
|
|
|
|
2016-01-04 02:47:09 +00:00
|
|
|
unpack = stdenv.mkDerivation (bootstrapFiles // {
|
2015-02-18 05:24:16 +00:00
|
|
|
name = "unpack";
|
|
|
|
|
|
|
|
# This is by necessity a near-duplicate of unpack-bootstrap-tools.sh. If we refer to it directly,
|
|
|
|
# we can't make any changes to it due to our testing stdenv depending on it. Think of this as the
|
|
|
|
# unpack-bootstrap-tools.sh for the next round of bootstrap tools.
|
|
|
|
# TODO: think through alternate designs, such as hosting this script as an output of the process.
|
|
|
|
buildCommand = ''
|
|
|
|
# Unpack the bootstrap tools tarball.
|
|
|
|
echo Unpacking the bootstrap tools...
|
|
|
|
$mkdir $out
|
|
|
|
$bzip2 -d < $tarball | (cd $out && $cpio -i)
|
|
|
|
|
|
|
|
# Set the ELF interpreter / RPATH in the bootstrap binaries.
|
|
|
|
echo Patching the tools...
|
|
|
|
|
|
|
|
export PATH=$out/bin
|
|
|
|
|
|
|
|
for i in $out/bin/*; do
|
|
|
|
if ! test -L $i; then
|
|
|
|
echo patching $i
|
|
|
|
install_name_tool -add_rpath $out/lib $i || true
|
|
|
|
fi
|
|
|
|
done
|
|
|
|
|
2016-10-16 02:36:51 +01:00
|
|
|
ln -s libresolv.9.dylib $out/lib/libresolv.dylib
|
|
|
|
|
2015-02-18 05:24:16 +00:00
|
|
|
for i in $out/lib/*.dylib $out/Library/Frameworks/CoreFoundation.framework/Versions/A/CoreFoundation; do
|
2016-10-16 02:36:51 +01:00
|
|
|
if test ! -L "$i" -a "$i" != "$out/lib/libSystem*.dylib"; then
|
|
|
|
echo "Patching $i"
|
2015-02-18 05:24:16 +00:00
|
|
|
|
|
|
|
id=$(otool -D "$i" | tail -n 1)
|
|
|
|
install_name_tool -id "$(dirname $i)/$(basename $id)" $i
|
|
|
|
|
2016-10-16 02:36:51 +01:00
|
|
|
libs=$(otool -L "$i" | tail -n +2 | grep -v libSystem | cat)
|
2015-02-18 05:24:16 +00:00
|
|
|
if [ -n "$libs" ]; then
|
|
|
|
install_name_tool -add_rpath $out/lib $i
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
done
|
|
|
|
|
|
|
|
ln -s bash $out/bin/sh
|
|
|
|
ln -s bzip2 $out/bin/bunzip2
|
|
|
|
|
2016-10-16 02:36:51 +01:00
|
|
|
# Provide a gunzip script.
|
|
|
|
cat > $out/bin/gunzip <<EOF
|
|
|
|
#!$out/bin/sh
|
|
|
|
exec $out/bin/gzip -d "\$@"
|
|
|
|
EOF
|
|
|
|
chmod +x $out/bin/gunzip
|
|
|
|
|
|
|
|
# Provide fgrep/egrep.
|
|
|
|
echo "#! $out/bin/sh" > $out/bin/egrep
|
|
|
|
echo "exec $out/bin/grep -E \"\$@\"" >> $out/bin/egrep
|
|
|
|
echo "#! $out/bin/sh" > $out/bin/fgrep
|
|
|
|
echo "exec $out/bin/grep -F \"\$@\"" >> $out/bin/fgrep
|
|
|
|
|
2015-02-18 05:24:16 +00:00
|
|
|
cat >$out/bin/dsymutil << EOF
|
|
|
|
#!$out/bin/sh
|
|
|
|
EOF
|
2016-10-16 02:36:51 +01:00
|
|
|
|
|
|
|
chmod +x $out/bin/egrep $out/bin/fgrep $out/bin/dsymutil
|
2015-02-18 05:24:16 +00:00
|
|
|
'';
|
|
|
|
|
|
|
|
allowedReferences = [ "out" ];
|
2016-01-04 02:47:09 +00:00
|
|
|
});
|
2015-02-18 05:24:16 +00:00
|
|
|
|
|
|
|
test = stdenv.mkDerivation {
|
|
|
|
name = "test";
|
|
|
|
|
|
|
|
realBuilder = "${unpack}/bin/bash";
|
|
|
|
|
|
|
|
buildCommand = ''
|
|
|
|
export PATH=${unpack}/bin
|
|
|
|
ls -l
|
|
|
|
mkdir $out
|
|
|
|
mkdir $out/bin
|
|
|
|
sed --version
|
|
|
|
find --version
|
|
|
|
diff --version
|
|
|
|
patch --version
|
|
|
|
make --version
|
|
|
|
awk --version
|
|
|
|
grep --version
|
|
|
|
clang --version
|
|
|
|
xz --version
|
|
|
|
|
|
|
|
# The grep will return a nonzero exit code if there is no match, and we want to assert that we have
|
|
|
|
# an SSL-capable curl
|
|
|
|
curl --version | grep SSL
|
|
|
|
|
2015-10-23 12:04:10 +01:00
|
|
|
${build}/on-server/sh -c 'echo Hello World'
|
2015-02-18 05:24:16 +00:00
|
|
|
|
2020-09-09 01:50:35 +01:00
|
|
|
# This approximates a bootstrap version of libSystem can that be
|
|
|
|
# assembled via fetchurl. Adapted from main libSystem expression.
|
|
|
|
mkdir libSystem-boot
|
|
|
|
cp -vr \
|
|
|
|
${darwin.darwin-stubs}/usr/lib/libSystem.B.tbd \
|
|
|
|
${darwin.darwin-stubs}/usr/lib/system \
|
|
|
|
libSystem-boot
|
|
|
|
|
|
|
|
substituteInPlace libSystem-boot/libSystem.B.tbd \
|
|
|
|
--replace "/usr/lib/system/" "$PWD/libSystem-boot/system/"
|
|
|
|
ln -s libSystem.B.tbd libSystem-boot/libSystem.tbd
|
|
|
|
# End of bootstrap libSystem
|
|
|
|
|
|
|
|
export flags="-idirafter ${unpack}/include-Libsystem --sysroot=${unpack} -L${unpack}/lib -L$PWD/libSystem-boot"
|
2015-02-18 05:24:16 +00:00
|
|
|
|
|
|
|
export CPP="clang -E $flags"
|
2017-05-06 02:34:16 +01:00
|
|
|
export CC="clang $flags -Wl,-rpath,${unpack}/lib -Wl,-v -Wl,-sdk_version,10.10"
|
|
|
|
export CXX="clang++ $flags --stdlib=libc++ -lc++abi -isystem${unpack}/include/c++/v1 -Wl,-rpath,${unpack}/lib -Wl,-v -Wl,-sdk_version,10.10"
|
2015-02-18 05:24:16 +00:00
|
|
|
|
|
|
|
echo '#include <stdio.h>' >> foo.c
|
|
|
|
echo '#include <float.h>' >> foo.c
|
|
|
|
echo '#include <limits.h>' >> foo.c
|
|
|
|
echo 'int main() { printf("Hello World\n"); return 0; }' >> foo.c
|
|
|
|
$CC -o $out/bin/foo foo.c
|
|
|
|
$out/bin/foo
|
|
|
|
|
|
|
|
echo '#include <CoreFoundation/CoreFoundation.h>' >> bar.c
|
|
|
|
echo 'int main() { CFShow(CFSTR("Hullo")); return 0; }' >> bar.c
|
|
|
|
$CC -F${unpack}/Library/Frameworks -framework CoreFoundation -o $out/bin/bar bar.c
|
|
|
|
$out/bin/bar
|
|
|
|
|
|
|
|
echo '#include <iostream>' >> bar.cc
|
|
|
|
echo 'int main() { std::cout << "Hello World\n"; }' >> bar.cc
|
|
|
|
$CXX -v -o $out/bin/bar bar.cc
|
|
|
|
$out/bin/bar
|
|
|
|
|
|
|
|
tar xvf ${hello.src}
|
|
|
|
cd hello-*
|
2022-02-07 22:53:57 +00:00
|
|
|
# stdenv bootstrap tools ship a broken libiconv.dylib https://github.com/NixOS/nixpkgs/issues/158331
|
|
|
|
am_cv_func_iconv=no ./configure --prefix=$out
|
2015-02-18 05:24:16 +00:00
|
|
|
make
|
|
|
|
make install
|
|
|
|
|
|
|
|
$out/bin/hello
|
|
|
|
'';
|
|
|
|
};
|
2016-01-04 02:47:09 +00:00
|
|
|
|
|
|
|
# The ultimate test: bootstrap a whole stdenv from the tools specified above and get a package set out of it
|
2016-12-04 01:21:07 +00:00
|
|
|
test-pkgs = import test-pkgspath {
|
2020-11-19 08:28:00 +00:00
|
|
|
# if the bootstrap tools are for another platform, we should be testing
|
|
|
|
# that platform.
|
stdenvBootstrapTools: inherit {cross,local}System
It's expected that attributes in the top-level package set will all use
that package set, but this wasn't the case for the bootstrap tools.
This led some very confusing behaviour:
- pkgsMusl.stdenvBootstrapTools would build glibc bootstrap tools
- stdenvBootstrapTools was _always_ cross compiled, even if
Nixpkgs wasn't, because it always set crossSystem. This also didn't
match the behaviour of using make-bootstrap-tools.nix as an
entrypoint, where crossSystem would default to null.
For the Linux stdenv, I've made the ideal fix, which is to make pkgs an
argument rather than taking the arguments for pkgs, and then
re-importing it. This means it'll always use exactly the same package
set that's calling it, and should also mean faster eval due to not
importing Nixpkgs twice.
The Darwin stdenv is more complicated, and I'm not able to easily test
it, so I wasn't confident in making the same fix there. Instead, I've
just made sure crossSystem and localSystem are set to the correct values
so they're not always cross compiled and match the parent package set's.
It would still be preferable if somebody could make Darwin's
make-bootstrap-tools.nix take pkgs as an argument, rather than all the
arguments for pkgs.
2022-05-30 15:16:22 +01:00
|
|
|
localSystem = if crossSystem != null then crossSystem else localSystem;
|
2020-11-19 08:28:00 +00:00
|
|
|
|
2016-12-16 13:22:02 +00:00
|
|
|
stdenvStages = args: let
|
2021-06-13 09:19:02 +01:00
|
|
|
args' = args // { inherit bootstrapLlvmVersion bootstrapFiles; };
|
2016-12-16 13:22:02 +00:00
|
|
|
in (import (test-pkgspath + "/pkgs/stdenv/darwin") args').stagesDarwin;
|
2016-01-04 02:47:09 +00:00
|
|
|
};
|
2015-02-18 05:24:16 +00:00
|
|
|
}
|