darwin.xnu: remove and replace with stubs
This commit is contained in:
Randy Eckenrode
@@ -265,9 +265,6 @@ developerToolsPackages_11_3_1 // macosPackages_11_0_1 // {
|
||||
libresolv = callPackage ./libresolv/package.nix { };
|
||||
libutil = callPackage ./libutil/package.nix { };
|
||||
removefile = callPackage ./removefile/package.nix { };
|
||||
xnu = if isSdk10_12 then
|
||||
applePackage "xnu" "osx-10.12.6" "sha256-C8TPQlUT3RbzAy8YnZPNtr70hpaVG9Llv0h42s3NENI=" {}
|
||||
else macosPackages_11_0_1.xnu;
|
||||
adv_cmds = callPackage ./adv_cmds/package.nix { };
|
||||
basic_cmds = callPackage ./basic_cmds/package.nix { };
|
||||
developer_cmds = callPackage ./developer_cmds/package.nix { };
|
||||
|
||||
@@ -19,5 +19,4 @@ removefile = applePackage' "removefile" "49.40.3" "macos-11.0.1" "0870ihxpmvj8gg
|
||||
shell_cmds = applePackage' "shell_cmds" "216.40.4" "macos-11.0.1" "0wbysc9lwf1xgl686r3yn95rndcmqlp17zc1ig9gsl5fxyy5bghh" {};
|
||||
text_cmds = applePackage' "text_cmds" "106" "macos-11.0.1" "17fn35m6i866zjrf8da6cq6crydp6vp4zq0aaab243rv1fx303yy" {};
|
||||
top = applePackage' "top" "129" "macos-11.0.1" "0d9pqmv3mwkfcv7c05hfvnvnn4rbsl92plr5hsazp854pshzqw2k" {};
|
||||
xnu = applePackage' "xnu" "7195.50.7.100.1" "macos-11.0.1" "11zjmpw11rcc6a0xlbwramra1rsr65s4ypnxwpajgbr2c657lipl" {};
|
||||
}
|
||||
|
||||
@@ -1,163 +0,0 @@
|
||||
{ appleDerivation', lib, stdenv, stdenvNoCC, buildPackages, pkgsBuildBuild
|
||||
, bootstrap_cmds, bison, flex
|
||||
, gnum4, unifdef, perl, python3
|
||||
, headersOnly ? true
|
||||
}:
|
||||
|
||||
appleDerivation' (if headersOnly then stdenvNoCC else stdenv) (
|
||||
let arch = if stdenv.hostPlatform.isx86_64 then "x86_64" else "arm64";
|
||||
in
|
||||
{
|
||||
depsBuildBuild = [ buildPackages.stdenv.cc ];
|
||||
|
||||
nativeBuildInputs = [ bootstrap_cmds bison flex gnum4 unifdef perl python3 ];
|
||||
|
||||
patches = lib.optionals (lib.versionOlder stdenv.hostPlatform.darwinSdkVersion "11") [ ./python3.patch ];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace Makefile \
|
||||
--replace "/bin/" "" \
|
||||
--replace "MAKEJOBS := " '# MAKEJOBS := '
|
||||
|
||||
substituteInPlace makedefs/MakeInc.cmd \
|
||||
--replace "/usr/bin/" "" \
|
||||
--replace "/bin/" "" \
|
||||
--replace "-Werror " ""
|
||||
|
||||
substituteInPlace makedefs/MakeInc.def \
|
||||
--replace "-c -S -m" "-c -m"
|
||||
|
||||
substituteInPlace makedefs/MakeInc.top \
|
||||
--replace "MEMORY_SIZE := " 'MEMORY_SIZE := 1073741824 # '
|
||||
|
||||
substituteInPlace libkern/kxld/Makefile \
|
||||
--replace "-Werror " ""
|
||||
|
||||
substituteInPlace SETUP/kextsymboltool/Makefile \
|
||||
--replace "-lstdc++" "-lc++"
|
||||
|
||||
substituteInPlace libsyscall/xcodescripts/mach_install_mig.sh \
|
||||
--replace "/usr/include" "/include" \
|
||||
--replace "/usr/local/include" "/include" \
|
||||
--replace 'MIG=`' "# " \
|
||||
--replace 'MIGCC=`' "# " \
|
||||
--replace " -o 0" "" \
|
||||
--replace '$SRC/$mig' '-I$DSTROOT/include $SRC/$mig' \
|
||||
--replace '$SRC/servers/netname.defs' '-I$DSTROOT/include $SRC/servers/netname.defs' \
|
||||
--replace '$BUILT_PRODUCTS_DIR/mig_hdr' '$BUILT_PRODUCTS_DIR'
|
||||
|
||||
patchShebangs .
|
||||
'' + lib.optionalString (lib.versionAtLeast stdenv.hostPlatform.darwinSdkVersion "11") ''
|
||||
# iig is closed-sourced, we don't have it
|
||||
# create an empty file to the header instead
|
||||
# this line becomes: echo "" > $@; echo --header ...
|
||||
substituteInPlace iokit/DriverKit/Makefile \
|
||||
--replace '--def $<' '> $@; echo'
|
||||
'';
|
||||
|
||||
PLATFORM = "MacOSX";
|
||||
SDKVERSION = "10.11";
|
||||
CC = "${stdenv.cc.targetPrefix or ""}cc";
|
||||
CXX = "${stdenv.cc.targetPrefix or ""}c++";
|
||||
MIG = "mig";
|
||||
MIGCOM = "migcom";
|
||||
STRIP = "${stdenv.cc.bintools.targetPrefix or ""}strip";
|
||||
RANLIB = "${stdenv.cc.bintools.targetPrefix or ""}ranlib";
|
||||
NM = "${stdenv.cc.bintools.targetPrefix or ""}nm";
|
||||
UNIFDEF = "unifdef";
|
||||
DSYMUTIL = "dsymutil";
|
||||
HOST_OS_VERSION = "10.10";
|
||||
HOST_CC = "${buildPackages.stdenv.cc.targetPrefix or ""}cc";
|
||||
HOST_FLEX = "flex";
|
||||
HOST_BISON = "bison";
|
||||
HOST_GM4 = "m4";
|
||||
MIGCC = "${lib.getBin pkgsBuildBuild.stdenv.cc.cc}/bin/clang";
|
||||
ARCHS = arch;
|
||||
ARCH_CONFIGS = arch;
|
||||
|
||||
env.NIX_CFLAGS_COMPILE = "-Wno-error";
|
||||
|
||||
preBuild = let macosVersion =
|
||||
"10.0 10.1 10.2 10.3 10.4 10.5 10.6 10.7 10.8 10.9 10.10 10.11" +
|
||||
lib.optionalString (lib.versionAtLeast stdenv.hostPlatform.darwinSdkVersion "11") " 10.12 10.13 10.14 10.15 11.0";
|
||||
in ''
|
||||
# This is a bit of a hack...
|
||||
mkdir -p sdk/usr/local/libexec
|
||||
|
||||
cat > sdk/usr/local/libexec/availability.pl <<EOF
|
||||
#!$SHELL
|
||||
if [ "\$1" == "--macosx" ]; then
|
||||
echo ${macosVersion}
|
||||
elif [ "\$1" == "--ios" ]; then
|
||||
echo 2.0 2.1 2.2 3.0 3.1 3.2 4.0 4.1 4.2 4.3 5.0 5.1 6.0 6.1 7.0 8.0 9.0
|
||||
fi
|
||||
EOF
|
||||
chmod +x sdk/usr/local/libexec/availability.pl
|
||||
|
||||
export SDKROOT_RESOLVED=$PWD/sdk
|
||||
export HOST_SDKROOT_RESOLVED=$PWD/sdk
|
||||
|
||||
export BUILT_PRODUCTS_DIR=.
|
||||
export DSTROOT=$out
|
||||
'';
|
||||
|
||||
buildFlags = lib.optional headersOnly "exporthdrs";
|
||||
installTargets = lib.optional headersOnly "installhdrs";
|
||||
|
||||
postInstall = lib.optionalString headersOnly ''
|
||||
mv $out/usr/include $out
|
||||
|
||||
(cd BUILD/obj/EXPORT_HDRS && find -type f -exec install -D \{} $out/include/\{} \;)
|
||||
|
||||
# TODO: figure out why I need to do this
|
||||
cp libsyscall/wrappers/*.h $out/include
|
||||
install -D libsyscall/os/tsd.h $out/include/os/tsd.h
|
||||
cp EXTERNAL_HEADERS/AssertMacros.h $out/include
|
||||
cp EXTERNAL_HEADERS/Availability*.h $out/System/Library/Frameworks/Kernel.framework/Versions/A/Headers/
|
||||
cp -r EXTERNAL_HEADERS/corecrypto $out/include
|
||||
|
||||
# These headers are needed by Libsystem.
|
||||
cp libsyscall/wrappers/{spawn/spawn.h,libproc/libproc.h} $out/include
|
||||
|
||||
# Build the mach headers we crave
|
||||
export SRCROOT=$PWD/libsyscall
|
||||
export DERIVED_SOURCES_DIR=$out/include
|
||||
export SDKROOT=$out
|
||||
export OBJROOT=$PWD
|
||||
export BUILT_PRODUCTS_DIR=$out
|
||||
libsyscall/xcodescripts/mach_install_mig.sh
|
||||
|
||||
# Get rid of the System prefix
|
||||
mv $out/System/* $out/
|
||||
rmdir $out/System
|
||||
|
||||
# TODO: do I need this?
|
||||
mv $out/internal_hdr/include/mach/*.h $out/include/mach
|
||||
|
||||
# Get rid of some junk lying around
|
||||
rm -rf $out/internal_hdr $out/usr $out/local
|
||||
|
||||
# Add some symlinks
|
||||
ln -s $out/Library/Frameworks/System.framework/Versions/B \
|
||||
$out/Library/Frameworks/System.framework/Versions/Current
|
||||
ln -s $out/Library/Frameworks/System.framework/Versions/Current/PrivateHeaders \
|
||||
$out/Library/Frameworks/System.framework/Headers
|
||||
|
||||
# IOKit (and possibly the others) is incomplete,
|
||||
# so let's not make it visible from here...
|
||||
mkdir $out/Library/PrivateFrameworks
|
||||
mv $out/Library/Frameworks/IOKit.framework $out/Library/PrivateFrameworks
|
||||
'';
|
||||
|
||||
appleHeaders = builtins.readFile (./. + "/headers-${stdenv.hostPlatform.darwinSdkVersion}-${arch}.txt");
|
||||
} // lib.optionalAttrs headersOnly {
|
||||
HOST_CODESIGN = "echo";
|
||||
HOST_CODESIGN_ALLOCATE = "echo";
|
||||
LIPO = "echo";
|
||||
LIBTOOL = "echo";
|
||||
CTFCONVERT = "echo";
|
||||
CTFMERGE = "echo";
|
||||
CTFINSERT = "echo";
|
||||
NMEDIT = "echo";
|
||||
IIG = "echo";
|
||||
})
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@@ -1,41 +0,0 @@
|
||||
diff --git a/bsd/kern/makekdebugevents.py b/bsd/kern/makekdebugevents.py
|
||||
index 73b2db4..d354ba0 100755
|
||||
--- a/bsd/kern/makekdebugevents.py
|
||||
+++ b/bsd/kern/makekdebugevents.py
|
||||
@@ -5,7 +5,7 @@
|
||||
# named kd_events[] or these mappings.
|
||||
# Required to generate a header file used by DEVELOPMENT and DEBUG kernels.
|
||||
#
|
||||
-
|
||||
+
|
||||
import sys
|
||||
import re
|
||||
|
||||
@@ -21,18 +21,18 @@ code_table = []
|
||||
# scan file to generate internal table
|
||||
with open(trace_code_file, 'rt') as codes:
|
||||
for line in codes:
|
||||
- m = id_name_pattern.match(line)
|
||||
- if m:
|
||||
+ m = id_name_pattern.match(line)
|
||||
+ if m:
|
||||
code_table += [(int(m.group(1),base=16), m.group(2))]
|
||||
|
||||
# emit typedef:
|
||||
-print "typedef struct {"
|
||||
-print " uint32_t id;"
|
||||
-print " const char *name;"
|
||||
-print "} kd_event_t;"
|
||||
+print("typedef struct {")
|
||||
+print(" uint32_t id;")
|
||||
+print(" const char *name;")
|
||||
+print("} kd_event_t;")
|
||||
# emit structure declaration and sorted initialization:
|
||||
-print "kd_event_t kd_events[] = {"
|
||||
+print("kd_event_t kd_events[] = {")
|
||||
for mapping in sorted(code_table, key=lambda x: x[0]):
|
||||
- print " {0x%x, \"%s\"}," % mapping
|
||||
-print "};"
|
||||
+ print(" {0x%x, \"%s\"}," % mapping)
|
||||
+print("};")
|
||||
|
||||
@@ -100,6 +100,7 @@ makeScopeWithSplicing' {
|
||||
"mDNSResponder"
|
||||
"objc4"
|
||||
"ppp"
|
||||
"xnu"
|
||||
] (mkStub apple_sdk.version);
|
||||
in
|
||||
|
||||
|
||||
Reference in New Issue
Block a user