diff options
author | Alyssa Ross <hi@alyssa.is> | 2019-08-14 00:20:49 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2019-08-14 00:23:16 +0000 |
commit | 4999a38db7c5de0ea9f514a12ecd4133cce647f3 (patch) | |
tree | bbb659ab07fda4c9b98053499b7e3f046ac6d5dc /nixpkgs/pkgs/development/python-modules/datatable/hardcode-library-paths.patch | |
parent | f9abd30e11337cf07034f2cc8ad1691aa4a69386 (diff) | |
parent | 8746c77a383f5c76153c7a181f3616d273acfa2a (diff) | |
download | nixlib-4999a38db7c5de0ea9f514a12ecd4133cce647f3.tar nixlib-4999a38db7c5de0ea9f514a12ecd4133cce647f3.tar.gz nixlib-4999a38db7c5de0ea9f514a12ecd4133cce647f3.tar.bz2 nixlib-4999a38db7c5de0ea9f514a12ecd4133cce647f3.tar.lz nixlib-4999a38db7c5de0ea9f514a12ecd4133cce647f3.tar.xz nixlib-4999a38db7c5de0ea9f514a12ecd4133cce647f3.tar.zst nixlib-4999a38db7c5de0ea9f514a12ecd4133cce647f3.zip |
Merge commit '8746c77a383f5c76153c7a181f3616d273acfa2a'
Diffstat (limited to 'nixpkgs/pkgs/development/python-modules/datatable/hardcode-library-paths.patch')
-rw-r--r-- | nixpkgs/pkgs/development/python-modules/datatable/hardcode-library-paths.patch | 43 |
1 files changed, 43 insertions, 0 deletions
diff --git a/nixpkgs/pkgs/development/python-modules/datatable/hardcode-library-paths.patch b/nixpkgs/pkgs/development/python-modules/datatable/hardcode-library-paths.patch new file mode 100644 index 000000000000..76c2f0e1dd7f --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/datatable/hardcode-library-paths.patch @@ -0,0 +1,43 @@ +diff --git a/ci/setup_utils.py b/ci/setup_utils.py +index 66b385a..6255af0 100644 +--- a/ci/setup_utils.py ++++ b/ci/setup_utils.py +@@ -600,37 +600,7 @@ def find_linked_dynamic_libraries(): + them as a list of absolute paths. + """ + with TaskContext("Find the required dynamic libraries") as log: +- llvm = get_llvm() +- libs = required_link_libraries() +- resolved = [] +- for libname in libs: +- if llvm: +- fullpath = os.path.join(llvm, "lib", libname) +- if os.path.isfile(fullpath): +- resolved.append(fullpath) +- log.info("Library `%s` found at %s" % (libname, fullpath)) +- continue +- else: +- log.info("%s does not exist" % fullpath) +- # Rely on the shell `locate` command to find the dynamic libraries. +- proc = subprocess.Popen(["locate", libname], stdout=subprocess.PIPE, +- stderr=subprocess.PIPE) +- stdout, stderr = proc.communicate() +- if proc.returncode == 0: +- results = stdout.decode().strip().split("\n") +- results = [r for r in results if r] +- if results: +- results.sort(key=len) +- fullpath = results[0] +- assert os.path.isfile(fullpath), "Invalid path: %r" % (fullpath,) +- resolved.append(fullpath) +- log.info("Library `%s` found at %s" % (libname, fullpath)) +- continue +- else: +- log.fatal("Cannot locate dynamic library `%s`" % libname) +- else: +- log.fatal("`locate` command returned the following error:\n%s" +- % stderr.decode()) ++ resolved = ["@libomp_dylib@", "@libcxx_dylib@", "@libcxxabi_dylib@"] + return resolved + + |