python3Packages.datatable: fix the Darwin build (#65613)
parent
ed5ed93422
commit
b1f0e2ace1
@ -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
|
||||
|
||||
|
@ -0,0 +1,28 @@ |
||||
diff --git a/setup.py b/setup.py
|
||||
index 58fc875..8032561 100644
|
||||
--- a/setup.py
|
||||
+++ b/setup.py
|
||||
@@ -141,23 +141,6 @@ if cmd in ("build", "bdist_wheel", "build_ext", "install"):
|
||||
extra_link_args = get_extra_link_args()
|
||||
cpp_files = get_c_sources("c")
|
||||
|
||||
- with TaskContext("Copy dynamic libraries") as log:
|
||||
- # Copy system libraries into the datatable/lib folder, so that they can
|
||||
- # be packaged with the wheel
|
||||
- libs = find_linked_dynamic_libraries()
|
||||
- for libpath in libs:
|
||||
- trgfile = os.path.join("datatable", "lib",
|
||||
- os.path.basename(libpath))
|
||||
- if os.path.exists(trgfile):
|
||||
- log.info("File %s already exists, skipped" % trgfile)
|
||||
- else:
|
||||
- log.info("Copying %s to %s" % (libpath, trgfile))
|
||||
- shutil.copy(libpath, trgfile)
|
||||
-
|
||||
- if ismacos():
|
||||
- monkey_patch_compiler()
|
||||
-
|
||||
-
|
||||
# Create the git version file
|
||||
if cmd in ("build", "sdist", "bdist_wheel", "install"):
|
||||
make_git_version_file(True)
|
Loading…
Reference in new issue