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

swift: fix UUID module and enable tests

Browse Source 
* fix UUID compilation error
  This was pointed out by Swift’s test suite.
* enable tests after build
  Two broken tests disabled for now.
This commit is contained in:
Michael Roitzsch 2019-12-10 15:14:42 +01:00
parent b472f4a2de
commit b82d443836
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pkgs/development/compilers/swift/default.nix
View File

@ -221,6 +221,8 @@ stdenv.mkDerivation {
# Workaround hardcoded dep on "libcurses" (vs "libncurses"): # Workaround hardcoded dep on "libcurses" (vs "libncurses"):
sed -i 's/curses/ncurses/' llbuild/*/*/CMakeLists.txt sed -i 's/curses/ncurses/' llbuild/*/*/CMakeLists.txt
# uuid.h is not part of glibc, but of libuuid
sed -i 's|''${GLIBC_INCLUDE_PATH}/uuid/uuid.h|${libuuid.dev}/include/uuid/uuid.h|' swift/stdlib/public/Platform/glibc.modulemap.gyb
PREFIX=''${out/#\/} PREFIX=''${out/#\/}
substituteInPlace indexstore-db/Utilities/build-script-helper.py \ substituteInPlace indexstore-db/Utilities/build-script-helper.py \
@ -265,15 +267,20 @@ stdenv.mkDerivation {
extra_cmake_options="${stdenv.lib.concatStringsSep "," cmakeFlags}" extra_cmake_options="${stdenv.lib.concatStringsSep "," cmakeFlags}"
''; '';
doCheck = false; doCheck = true;
checkInputs = [ file ]; checkInputs = [ file ];
# TODO: investigate the non-working tests
checkPhase = '' checkPhase = ''
# FIXME: disable non-working tests
rm $SWIFT_SOURCE_ROOT/swift/test/Driver/static-stdlib-linux.swift # static linkage of libatomic.a complains about missing PIC
rm $SWIFT_SOURCE_ROOT/swift/validation-test/Python/build_swift.swift # install_prefix not passed properly
# match the swift wrapper in the install phase
export LIBRARY_PATH=${icu}/lib:${libuuid.out}/lib
checkTarget=check-swift-all checkTarget=check-swift-all
ninjaFlags='-C buildbot_linux/swift-${stdenv.hostPlatform.parsed.kernel.name}-${stdenv.hostPlatform.parsed.cpu.name}' ninjaFlags='-C buildbot_linux/swift-${stdenv.hostPlatform.parsed.kernel.name}-${stdenv.hostPlatform.parsed.cpu.name}'
ninjaCheckPhase ninjaCheckPhase
''; '';
@ -292,7 +299,7 @@ stdenv.mkDerivation {
wrapProgram $out/bin/swift \ wrapProgram $out/bin/swift \
--suffix C_INCLUDE_PATH : $out/lib/swift/clang/include \ --suffix C_INCLUDE_PATH : $out/lib/swift/clang/include \
--suffix CPLUS_INCLUDE_PATH : $out/lib/swift/clang/include \ --suffix CPLUS_INCLUDE_PATH : $out/lib/swift/clang/include \
--suffix LIBRARY_PATH : $icu/lib --suffix LIBRARY_PATH : ${icu}/lib:${libuuid.out}/lib
''; '';
# Hack to avoid build and install directories in RPATHs. # Hack to avoid build and install directories in RPATHs.