mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-10-30 22:21:26 +00:00
darwin.cctools: 927.0.2 -> 949.0.1
Needed for iOS 13 support
This commit is contained in:
parent
39c536c8db
commit
3c6bd61560
@ -17,92 +17,90 @@ in
|
||||
# Non-Darwin alternatives
|
||||
assert (!stdenv.hostPlatform.isDarwin) -> maloader != null;
|
||||
|
||||
let
|
||||
baseParams = rec {
|
||||
name = "${targetPrefix}cctools-port";
|
||||
version = "927.0.2";
|
||||
stdenv.mkDerivation {
|
||||
pname = "${targetPrefix}cctools-port";
|
||||
version = "949.0.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tpoechtrager";
|
||||
repo = "cctools-port";
|
||||
rev = "8239a5211bcf07d6b9d359782e1a889ec1d7cce5";
|
||||
sha256 = "0h8b1my0wf1jyjq63wbiqkl2clgxsf87f6i4fjhqs431fzlq8sac";
|
||||
};
|
||||
src = fetchFromGitHub {
|
||||
owner = "tpoechtrager";
|
||||
repo = "cctools-port";
|
||||
rev = "43f32a4c61b5ba7fde011e816136c550b1b3146f";
|
||||
sha256 = "10yc5smiczzm62q6ijqccc58bwmfhc897f3bwa5i9j98csqsjj0k";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" "man" ];
|
||||
outputs = [ "out" "dev" "man" ];
|
||||
|
||||
nativeBuildInputs = [ autoconf automake libtool autoreconfHook installShellFiles ];
|
||||
buildInputs = [ libuuid ]
|
||||
++ stdenv.lib.optionals stdenv.isDarwin [ libcxxabi libobjc ]
|
||||
++ stdenv.lib.optional enableTapiSupport libtapi;
|
||||
nativeBuildInputs = [ autoconf automake libtool autoreconfHook installShellFiles ];
|
||||
buildInputs = [ libuuid ]
|
||||
++ stdenv.lib.optionals stdenv.isDarwin [ libcxxabi libobjc ]
|
||||
++ stdenv.lib.optional enableTapiSupport libtapi;
|
||||
|
||||
patches = [ ./ld-ignore-rpath-link.patch ./ld-rpath-nonfinal.patch ];
|
||||
patches = [ ./ld-ignore-rpath-link.patch ./ld-rpath-nonfinal.patch ];
|
||||
|
||||
__propagatedImpureHostDeps = [
|
||||
# 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"
|
||||
__propagatedImpureHostDeps = [
|
||||
# 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"
|
||||
];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
# TODO(@Ericson2314): Always pass "--target" and always targetPrefix.
|
||||
configurePlatforms = [ "build" "host" ]
|
||||
++ stdenv.lib.optional (stdenv.targetPlatform != stdenv.hostPlatform) "target";
|
||||
configureFlags = [ "--disable-clang-as" ]
|
||||
++ stdenv.lib.optionals enableTapiSupport [
|
||||
"--enable-tapi-support"
|
||||
"--with-libtapi=${libtapi}"
|
||||
];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
postPatch = stdenv.lib.optionalString stdenv.hostPlatform.isDarwin ''
|
||||
substituteInPlace cctools/Makefile.am --replace libobjc2 ""
|
||||
'' + ''
|
||||
sed -i -e 's/addStandardLibraryDirectories = true/addStandardLibraryDirectories = false/' cctools/ld64/src/ld/Options.cpp
|
||||
|
||||
# TODO(@Ericson2314): Always pass "--target" and always targetPrefix.
|
||||
configurePlatforms = [ "build" "host" ]
|
||||
++ stdenv.lib.optional (stdenv.targetPlatform != stdenv.hostPlatform) "target";
|
||||
configureFlags = [ "--disable-clang-as" ]
|
||||
++ stdenv.lib.optionals enableTapiSupport [
|
||||
"--enable-tapi-support"
|
||||
"--with-libtapi=${libtapi}"
|
||||
];
|
||||
# FIXME: there are far more absolute path references that I don't want to fix right now
|
||||
substituteInPlace cctools/configure.ac \
|
||||
--replace "-isystem /usr/local/include -isystem /usr/pkg/include" "" \
|
||||
--replace "-L/usr/local/lib" "" \
|
||||
|
||||
postPatch = stdenv.lib.optionalString stdenv.hostPlatform.isDarwin ''
|
||||
substituteInPlace cctools/Makefile.am --replace libobjc2 ""
|
||||
'' + ''
|
||||
sed -i -e 's/addStandardLibraryDirectories = true/addStandardLibraryDirectories = false/' cctools/ld64/src/ld/Options.cpp
|
||||
substituteInPlace cctools/include/Makefile \
|
||||
--replace "/bin/" ""
|
||||
|
||||
# FIXME: there are far more absolute path references that I don't want to fix right now
|
||||
substituteInPlace cctools/configure.ac \
|
||||
--replace "-isystem /usr/local/include -isystem /usr/pkg/include" "" \
|
||||
--replace "-L/usr/local/lib" "" \
|
||||
patchShebangs tools
|
||||
sed -i -e 's/which/type -P/' tools/*.sh
|
||||
|
||||
substituteInPlace cctools/include/Makefile \
|
||||
--replace "/bin/" ""
|
||||
# Workaround for https://www.sourceware.org/bugzilla/show_bug.cgi?id=11157
|
||||
cat > cctools/include/unistd.h <<EOF
|
||||
#ifdef __block
|
||||
# undef __block
|
||||
# include_next "unistd.h"
|
||||
# define __block __attribute__((__blocks__(byref)))
|
||||
#else
|
||||
# include_next "unistd.h"
|
||||
#endif
|
||||
EOF
|
||||
|
||||
patchShebangs tools
|
||||
sed -i -e 's/which/type -P/' tools/*.sh
|
||||
cd cctools
|
||||
'';
|
||||
|
||||
# Workaround for https://www.sourceware.org/bugzilla/show_bug.cgi?id=11157
|
||||
cat > cctools/include/unistd.h <<EOF
|
||||
#ifdef __block
|
||||
# undef __block
|
||||
# include_next "unistd.h"
|
||||
# define __block __attribute__((__blocks__(byref)))
|
||||
#else
|
||||
# include_next "unistd.h"
|
||||
#endif
|
||||
EOF
|
||||
preInstall = ''
|
||||
pushd include
|
||||
make DSTROOT=$out/include RC_OS=common install
|
||||
popd
|
||||
|
||||
cd cctools
|
||||
'';
|
||||
installManPage ar/ar.{1,5}
|
||||
'';
|
||||
|
||||
preInstall = ''
|
||||
pushd include
|
||||
make DSTROOT=$out/include RC_OS=common install
|
||||
popd
|
||||
|
||||
installManPage ar/ar.{1,5}
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
inherit targetPrefix;
|
||||
};
|
||||
|
||||
meta = {
|
||||
broken = !stdenv.targetPlatform.isDarwin; # Only supports darwin targets
|
||||
homepage = "http://www.opensource.apple.com/source/cctools/";
|
||||
description = "MacOS Compiler Tools (cross-platform port)";
|
||||
license = stdenv.lib.licenses.apsl20;
|
||||
maintainers = with stdenv.lib.maintainers; [ matthewbauer ];
|
||||
};
|
||||
passthru = {
|
||||
inherit targetPrefix;
|
||||
};
|
||||
in stdenv.mkDerivation baseParams
|
||||
|
||||
meta = {
|
||||
broken = !stdenv.targetPlatform.isDarwin; # Only supports darwin targets
|
||||
homepage = "http://www.opensource.apple.com/source/cctools/";
|
||||
description = "MacOS Compiler Tools (cross-platform port)";
|
||||
license = stdenv.lib.licenses.apsl20;
|
||||
maintainers = with stdenv.lib.maintainers; [ matthewbauer ];
|
||||
};
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user