From cf40d08908ede4061eb15513b770c98877844b8b Mon Sep 17 00:00:00 2001 From: Vincent Ambo Date: Tue, 19 May 2020 20:34:12 +0100 Subject: chore(3p/nix): Remove OSX only 'resolve-system-dependencies' tool --- third_party/nix/meson.build | 1 - third_party/nix/src/meson.build | 1 - .../src/resolve-system-dependencies/meson.build | 58 ------ .../resolve-system-dependencies.cc | 208 --------------------- 4 files changed, 268 deletions(-) delete mode 100644 third_party/nix/src/resolve-system-dependencies/meson.build delete mode 100644 third_party/nix/src/resolve-system-dependencies/resolve-system-dependencies.cc (limited to 'third_party') diff --git a/third_party/nix/meson.build b/third_party/nix/meson.build index 78b84617a521..8c5eaf6cf9bc 100644 --- a/third_party/nix/meson.build +++ b/third_party/nix/meson.build @@ -18,7 +18,6 @@ cpp = meson.get_compiler('cpp') add_project_arguments(get_option('cxxflags'), language : 'cpp') add_project_link_arguments(get_option('ldflags'), language: 'cpp') -cmake = import('cmake') pkg = import('pkgconfig') config_h = configuration_data() diff --git a/third_party/nix/src/meson.build b/third_party/nix/src/meson.build index 9961b0938f74..59916a944aed 100644 --- a/third_party/nix/src/meson.build +++ b/third_party/nix/src/meson.build @@ -7,7 +7,6 @@ src_dirs = [ 'libmain', 'libexpr', 'nix', - 'resolve-system-dependencies' ] foreach dir : src_dirs diff --git a/third_party/nix/src/resolve-system-dependencies/meson.build b/third_party/nix/src/resolve-system-dependencies/meson.build deleted file mode 100644 index afabed15e1e2..000000000000 --- a/third_party/nix/src/resolve-system-dependencies/meson.build +++ /dev/null @@ -1,58 +0,0 @@ -# Nix exec build file -#============================================================================ - - - - -# src files -#============================================================================ - -nix_src = files( - join_paths(meson.source_root(), - 'src/resolve-system-dependencies/resolve-system-dependencies.cc')) - - - -# dependancies -#============================================================================ - -sys_deps_dep_list = [] - - - - -# Link args -#============================================================================ - -sys_deps_link_args = [] - - - - -# compiler args -#============================================================================ - -sys_deps_cxx_args = [] - - - - -# targets -#============================================================================ - - - - -# build -#============================================================================ - -if sys_name == 'darwin' - sys_deps_bin = executable( - 'resolve-system-dependencies', - install : true, - install_dir : bindir, - include_directories : src_inc, - sources : nix_src, - link_args : sys_deps_link_args, - dependencies : sys_deps_dep_list) -endif \ No newline at end of file diff --git a/third_party/nix/src/resolve-system-dependencies/resolve-system-dependencies.cc b/third_party/nix/src/resolve-system-dependencies/resolve-system-dependencies.cc deleted file mode 100644 index 7fc405faae6b..000000000000 --- a/third_party/nix/src/resolve-system-dependencies/resolve-system-dependencies.cc +++ /dev/null @@ -1,208 +0,0 @@ -#include -#include -#include - -#include -#include -#include -#include -#include - -#include "derivations.hh" -#include "globals.hh" -#include "shared.hh" -#include "store-api.hh" - -#define DO_SWAP(x, y) ((x) ? OSSwapInt32(y) : (y)) - -using namespace nix; - -static auto cacheDir = Path{}; - -Path resolveCacheFile(Path lib) { - std::replace(lib.begin(), lib.end(), '/', '%'); - return cacheDir + "/" + lib; -} - -std::set readCacheFile(const Path& file) { - return tokenizeString>(readFile(file), "\n"); -} - -std::set runResolver(const Path& filename) { - AutoCloseFD fd = open(filename.c_str(), O_RDONLY); - if (!fd) { - throw SysError("opening '%s'", filename); - } - - struct stat st; - if (fstat(fd.get(), &st)) { - throw SysError("statting '%s'", filename); - } - - if (!S_ISREG(st.st_mode)) { - printError("file '%s' is not a regular file", filename); - return {}; - } - - if (st.st_size < sizeof(mach_header_64)) { - printError("file '%s' is too short for a MACH binary", filename); - return {}; - } - - char* obj = (char*)mmap(NULL, st.st_size, PROT_READ, MAP_SHARED, fd.get(), 0); - if (!obj) { - throw SysError("mmapping '%s'", filename); - } - - ptrdiff_t mach64_offset = 0; - - uint32_t magic = ((mach_header_64*)obj)->magic; - if (magic == FAT_CIGAM || magic == FAT_MAGIC) { - bool should_swap = magic == FAT_CIGAM; - uint32_t narches = DO_SWAP(should_swap, ((fat_header*)obj)->nfat_arch); - for (uint32_t i = 0; i < narches; i++) { - fat_arch* arch = - (fat_arch*)(obj + sizeof(fat_header) + sizeof(fat_arch) * i); - if (DO_SWAP(should_swap, arch->cputype) == CPU_TYPE_X86_64) { - mach64_offset = (ptrdiff_t)DO_SWAP(should_swap, arch->offset); - break; - } - } - if (mach64_offset == 0) { - printError( - format( - "Could not find any mach64 blobs in file '%1%', continuing...") % - filename); - return {}; - } - } else if (magic == MH_MAGIC_64 || magic == MH_CIGAM_64) { - mach64_offset = 0; - } else { - printError( - format("Object file has unknown magic number '%1%', skipping it...") % - magic); - return {}; - } - - mach_header_64* m_header = (mach_header_64*)(obj + mach64_offset); - - bool should_swap = magic == MH_CIGAM_64; - ptrdiff_t cmd_offset = mach64_offset + sizeof(mach_header_64); - - std::set libs; - for (uint32_t i = 0; i < DO_SWAP(should_swap, m_header->ncmds); i++) { - load_command* cmd = (load_command*)(obj + cmd_offset); - switch (DO_SWAP(should_swap, cmd->cmd)) { - case LC_LOAD_UPWARD_DYLIB: - case LC_LOAD_DYLIB: - case LC_REEXPORT_DYLIB: - libs.insert( - std::string((char*)cmd + ((dylib_command*)cmd)->dylib.name.offset)); - break; - } - cmd_offset += DO_SWAP(should_swap, cmd->cmdsize); - } - - return libs; -} - -bool isSymlink(const Path& path) { - struct stat st; - if (lstat(path.c_str(), &st) == -1) - throw SysError("getting attributes of path '%1%'", path); - - return S_ISLNK(st.st_mode); -} - -Path resolveSymlink(const Path& path) { - auto target = readLink(path); - return hasPrefix(target, "/") ? target : dirOf(path) + "/" + target; -} - -std::set resolveTree(const Path& path, PathSet& deps) { - std::set results; - if (deps.count(path)) { - return {}; - } - deps.insert(path); - for (auto& lib : runResolver(path)) { - results.insert(lib); - for (auto& p : resolveTree(lib, deps)) { - results.insert(p); - } - } - return results; -} - -std::set getPath(const Path& path) { - if (hasPrefix(path, "/dev")) { - return {}; - } - - Path cacheFile = resolveCacheFile(path); - if (pathExists(cacheFile)) { - return readCacheFile(cacheFile); - } - - std::set deps, paths; - paths.insert(path); - - Path nextPath(path); - while (isSymlink(nextPath)) { - nextPath = resolveSymlink(nextPath); - paths.insert(nextPath); - } - - for (auto& t : resolveTree(nextPath, deps)) { - paths.insert(t); - } - - writeFile(cacheFile, concatStringsSep("\n", paths)); - - return paths; -} - -int main(int argc, char** argv) { - return handleExceptions(argv[0], [&]() { - initNix(); - - struct utsname _uname; - - uname(&_uname); - - auto cacheParentDir = - (format("%1%/dependency-maps") % settings.nixStateDir).str(); - - cacheDir = (format("%1%/%2%-%3%-%4%") % cacheParentDir % _uname.machine % - _uname.sysname % _uname.release) - .str(); - - mkdir(cacheParentDir.c_str(), 0755); - mkdir(cacheDir.c_str(), 0755); - - auto store = openStore(); - - StringSet impurePaths; - - if (std::string(argv[1]) == "--test") - impurePaths.insert(argv[2]); - else { - auto drv = store->derivationFromPath(Path(argv[1])); - impurePaths = tokenizeString(get(drv.env, "__impureHostDeps")); - impurePaths.insert("/usr/lib/libSystem.dylib"); - } - - std::set allPaths; - - for (auto& path : impurePaths) - for (auto& p : getPath(path)) { - allPaths.insert(p); - } - - std::cout << "extra-chroot-dirs" << std::endl; - for (auto& path : allPaths) { - std::cout << path << std::endl; - } - std::cout << std::endl; - }); -} -- cgit 1.4.1