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

darwin.cctools: 927.0.2 -> 949.0.1

Browse Source 
Needed for iOS 13 support
This commit is contained in:
Matthew Bauer 2020-07-20 15:48:39 -05:00
parent 39c536c8db
commit 3c6bd61560
1 changed files with 71 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -17,92 +17,90 @@ in
# Non-Darwin alternatives # Non-Darwin alternatives
assert (!stdenv.hostPlatform.isDarwin) -> maloader != null; assert (!stdenv.hostPlatform.isDarwin) -> maloader != null;
let stdenv.mkDerivation {
baseParams = rec { pname = "${targetPrefix}cctools-port";
name = "${targetPrefix}cctools-port"; version = "949.0.1";
version = "927.0.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "tpoechtrager"; owner = "tpoechtrager";
repo = "cctools-port"; repo = "cctools-port";
rev = "8239a5211bcf07d6b9d359782e1a889ec1d7cce5"; rev = "43f32a4c61b5ba7fde011e816136c550b1b3146f";
sha256 = "0h8b1my0wf1jyjq63wbiqkl2clgxsf87f6i4fjhqs431fzlq8sac"; sha256 = "10yc5smiczzm62q6ijqccc58bwmfhc897f3bwa5i9j98csqsjj0k";
}; };
outputs = [ "out" "dev" "man" ]; outputs = [ "out" "dev" "man" ];
nativeBuildInputs = [ autoconf automake libtool autoreconfHook installShellFiles ]; nativeBuildInputs = [ autoconf automake libtool autoreconfHook installShellFiles ];
buildInputs = [ libuuid ] buildInputs = [ libuuid ]
++ stdenv.lib.optionals stdenv.isDarwin [ libcxxabi libobjc ] ++ stdenv.lib.optionals stdenv.isDarwin [ libcxxabi libobjc ]
++ stdenv.lib.optional enableTapiSupport libtapi; ++ 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 = [ __propagatedImpureHostDeps = [
# As far as I can tell, otool from cctools is the only thing that depends on these two, and we should fix them # 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.A.dylib"
"/usr/lib/libobjc.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. # FIXME: there are far more absolute path references that I don't want to fix right now
configurePlatforms = [ "build" "host" ] substituteInPlace cctools/configure.ac \
++ stdenv.lib.optional (stdenv.targetPlatform != stdenv.hostPlatform) "target"; --replace "-isystem /usr/local/include -isystem /usr/pkg/include" "" \
configureFlags = [ "--disable-clang-as" ] --replace "-L/usr/local/lib" "" \
++ stdenv.lib.optionals enableTapiSupport [
"--enable-tapi-support"
"--with-libtapi=${libtapi}"
];
postPatch = stdenv.lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace cctools/include/Makefile \
substituteInPlace cctools/Makefile.am --replace libobjc2 "" --replace "/bin/" ""
'' + ''
sed -i -e 's/addStandardLibraryDirectories = true/addStandardLibraryDirectories = false/' cctools/ld64/src/ld/Options.cpp
# FIXME: there are far more absolute path references that I don't want to fix right now patchShebangs tools
substituteInPlace cctools/configure.ac \ sed -i -e 's/which/type -P/' tools/*.sh
--replace "-isystem /usr/local/include -isystem /usr/pkg/include" "" \
--replace "-L/usr/local/lib" "" \
substituteInPlace cctools/include/Makefile \ # Workaround for https://www.sourceware.org/bugzilla/show_bug.cgi?id=11157
--replace "/bin/" "" 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 cd cctools
sed -i -e 's/which/type -P/' tools/*.sh '';
# Workaround for https://www.sourceware.org/bugzilla/show_bug.cgi?id=11157 preInstall = ''
cat > cctools/include/unistd.h <<EOF pushd include
#ifdef __block make DSTROOT=$out/include RC_OS=common install
# undef __block popd
# include_next "unistd.h"
# define __block __attribute__((__blocks__(byref)))
#else
# include_next "unistd.h"
#endif
EOF
cd cctools installManPage ar/ar.{1,5}
''; '';
preInstall = '' passthru = {
pushd include inherit targetPrefix;
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 ];
};
}; };
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 ];
};
}