JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cctools-port: Use old version for iOS to support TBD linking

Browse Source
This commit is contained in:
Ken Micklas 2018-04-15 19:22:17 -04:00
parent ebc2243778
commit 60771af5b6
4 changed files with 160 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

98
pkgs/os-specific/darwin/cctools/ld-tbd-v2.patch Normal file
View File

@ -0,0 +1,98 @@
diff --git a/cctools/ld64/src/ld/parsers/textstub_dylib_file.cpp b/cctools/ld64/src/ld/parsers/textstub_dylib_file.cpp
index 09c0e12..ac6b085 100644
--- a/cctools/ld64/src/ld/parsers/textstub_dylib_file.cpp
+++ b/cctools/ld64/src/ld/parsers/textstub_dylib_file.cpp
@@ -187,6 +187,7 @@ struct DynamicLibrary {
ld::File::ObjcConstraint _objcConstraint;
Options::Platform _platform;
std::vector<Token> _allowedClients;
+ std::vector<Token> _allowableClients;
std::vector<Token> _reexportedLibraries;
std::vector<Token> _symbols;
std::vector<Token> _classes;
@@ -246,6 +247,14 @@ class TBDFile {
});
}
+ void parseAllowableClients(DynamicLibrary& lib) {
+ if ( !hasOptionalToken("allowable-clients") )
+ return;
+ parseFlowSequence([&](Token name) {
+ lib._allowableClients.emplace_back(name);
+ });
+ }
+
void parseReexportedDylibs(DynamicLibrary& lib) {
if ( !hasOptionalToken("re-exports") )
return;
@@ -306,6 +315,21 @@ class TBDFile {
return false;
}
+ void skipUUIDs(DynamicLibrary& lib) {
+ expectToken("uuids");
+ while ( true ) {
+ auto token = next();
+ if ( token == "]" )
+ break;
+ }
+ }
+
+ void skipParentUmbrella(DynamicLibrary& lib) {
+ if (!hasOptionalToken("parent-umbrella"))
+ return;
+ next();
+ }
+
void parsePlatform(DynamicLibrary& lib) {
expectToken("platform");
@@ -410,6 +434,7 @@ class TBDFile {
}
parseAllowedClients(lib);
+ parseAllowableClients(lib);
parseReexportedDylibs(lib);
parseSymbols(lib);
if ( !hasOptionalToken("-") )
@@ -455,17 +480,21 @@ class TBDFile {
return result.front();
}
- void parseDocument(DynamicLibrary& lib, std::string &requestedArchName) {
+ void parseDocument(DynamicLibrary& lib, std::string &requestedArchName, bool isTbdV2) {
auto selectedArchName = parseAndSelectArchitecture(requestedArchName);
if (selectedArchName.empty())
throwf("invalid arch");
+ if(isTbdV2)
+ skipUUIDs(lib);
parsePlatform(lib);
parseInstallName(lib);
parseCurrentVersion(lib);
parseCompatibilityVersion(lib);
parseSwiftVersion(lib);
parseObjCConstraint(lib);
+ if(isTbdV2)
+ skipParentUmbrella(lib);
parseExportsBlock(lib, selectedArchName);
}
@@ -476,7 +505,8 @@ public:
_tokenizer.reset();
DynamicLibrary lib;
expectToken("---");
- parseDocument(lib, requestedArchName);
+ auto isTbdV2 = hasOptionalToken("!tapi-tbd-v2");
+ parseDocument(lib, requestedArchName, isTbdV2);
expectToken("...");
return lib;
}
@@ -486,6 +516,7 @@ public:
auto token = next();
if ( token != "---" )
return false;
+ hasOptionalToken("!tapi-tbd-v2");
return !parseAndSelectArchitecture(requestedArchName).empty();
}

37
pkgs/os-specific/darwin/cctools/port.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, makeWrapper, autoconf, automake, libtool_2
{ stdenv, fetchFromGitHub, makeWrapper, autoconf, automake, libtool_2, autoreconfHook
, llvm, libcxx, libcxxabi, clang, libuuid
, libobjc ? null, maloader ? null, xctoolchain ? null
, hostPlatform, targetPlatform
@ -6,6 +6,14 @@
}:
let
# We need to use an old version of cctools-port to support linking TBD files
# in the iOS SDK. Note that this only provides support for SDK versions up to
# 10.x. For 11.0 and higher we will need to upgrade to a newer cctools than the
# default version here, which can support the new TBD format via Apple's
# libtapi.
useOld = targetPlatform.isiOS;
# The targetPrefix prepended to binary names to allow multiple binuntils on the
# PATH to both be usable.
targetPrefix = stdenv.lib.optionalString
@ -16,10 +24,12 @@ in
# Non-Darwin alternatives
assert (!hostPlatform.isDarwin) -> (maloader != null && xctoolchain != null);
assert enableDumpNormalizedLibArgs -> (!useOld);
let
baseParams = rec {
name = "${targetPrefix}cctools-port-${version}";
version = "895";
version = if useOld then "886" else "895";
src = fetchFromGitHub (if enableDumpNormalizedLibArgs then {
owner = "tpoechtrager";
@ -27,6 +37,11 @@ let
# master with https://github.com/tpoechtrager/cctools-port/pull/34
rev = "8395d4b2c3350356e2fb02f5e04f4f463c7388df";
sha256 = "10vbf1cfzx02q8chc77s84fp2kydjpx2y682mr6mrbb7sq5rwh8f";
} else if useOld then {
owner = "tpoechtrager";
repo = "cctools-port";
rev = "02f0b8ecd87a3951653d838a321ae744815e21a5";
sha256 = "0bzyabzr5dvbxglr74d0kbrk2ij5x7s5qcamqi1v546q1had1wz1";
} else {
owner = "tpoechtrager";
repo = "cctools-port";
@ -36,7 +51,11 @@ let
outputs = [ "out" "dev" ];
nativeBuildInputs = [ autoconf automake libtool_2 ];
nativeBuildInputs = [
autoconf automake libtool_2
] ++ stdenv.lib.optionals useOld [
autoreconfHook
];
buildInputs = [ libuuid ] ++
# Only need llvm and clang if the stdenv isn't already clang-based (TODO: just make a stdenv.cc.isClang)
stdenv.lib.optionals (!stdenv.isDarwin) [ llvm clang ] ++
@ -44,9 +63,14 @@ let
patches = [
./ld-rpath-nonfinal.patch ./ld-ignore-rpath-link.patch
] ++ stdenv.lib.optionals useOld [
# See https://github.com/tpoechtrager/cctools-port/issues/24. Remove when that's fixed.
./undo-unknown-triple.patch
./ld-tbd-v2.patch
./support-ios.patch
];
__propagatedImpureHostDeps = [
__propagatedImpureHostDeps = stdenv.lib.optionals (!useOld) [
# As far as I can tell, otool from cctools is the only thing that depends on these two, and we should fix them
"/usr/lib/libobjc.A.dylib"
"/usr/lib/libobjc.dylib"
@ -86,12 +110,15 @@ let
EOF
'' + stdenv.lib.optionalString (!stdenv.isDarwin) ''
sed -i -e 's|clang++|& -I${libcxx}/include/c++/v1|' cctools/autogen.sh
'' + stdenv.lib.optionalString useOld ''
cd cctools
'';
# TODO: this builds an ld without support for LLVM's LTO. We need to teach it, but that's rather
# hairy to handle during bootstrap. Perhaps it could be optional?
preConfigure = ''
preConfigure = stdenv.lib.optionalString (!useOld) ''
cd cctools
'' + ''
sh autogen.sh
'';

13
pkgs/os-specific/darwin/cctools/support-ios.patch Normal file
View File

@ -0,0 +1,13 @@
diff --git a/cctools/configure.ac b/cctools/configure.ac
index 56e8f24..0b4b3ff 100644
--- a/cctools/configure.ac
+++ b/cctools/configure.ac
@@ -39,7 +39,7 @@ EXTRACXXFLAGS=""
WARNINGS=""
case $host_os in
- darwin* )
+ darwin* | ios*)
isdarwin=yes
AM_CONDITIONAL([ISDARWIN], [true])
;;

17
pkgs/os-specific/darwin/cctools/undo-unknown-triple.patch Normal file
View File

@ -0,0 +1,17 @@
diff --git a/cctools/as/driver.c b/cctools/as/driver.c
index b06d085..c03397a 100644
--- a/cctools/as/driver.c
+++ b/cctools/as/driver.c
@@ -363,12 +363,6 @@ char **envp)
/* Add -c or clang will run ld(1). */
new_argv[j] = "-c";
j++;
- /* cctools-port start */
- new_argv[j] = "-target";
- j++;
- new_argv[j] = "unknown-apple-darwin";
- j++;
- /* cctools-port end */
new_argv[j] = NULL;
if(execute(new_argv, verbose))
exit(0);