BLD Ignore runtime lib flag on linking (#2848)

This commit is contained in:
Gyeongjae Choi 2022-07-10 19:11:03 +09:00 committed by GitHub
parent ffd070a55e
commit 1b4b028993
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 9 additions and 32 deletions

View File

@ -7,7 +7,6 @@ source:
sha256: 3fcf37884383c5da64846ab510190720027dca0768def34dd8dcb659dbe5cbf3
patches:
- patches/configure.patch
- patches/build.patch
requirements:
run:

View File

@ -1,13 +0,0 @@
diff --git a/setup_build.py b/setup_build.py
index 6b66789..448774a 100644
--- a/setup_build.py
+++ b/setup_build.py
@@ -104,7 +104,7 @@ class h5py_build_ext(build_ext):
settings['include_dirs'] += [mpi4py.get_include()]
# TODO: should this only be done on UNIX?
- if os.name != 'nt':
+ if False:
settings['runtime_library_dirs'] = settings['library_dirs']
def make_extension(module):

View File

@ -5,8 +5,6 @@ package:
source:
url: https://files.pythonhosted.org/packages/e3/4d/348402c2fb0d8a8e85a88b8babc6f4efaae9692b7524aedce5fddbef3baf/pyproj-3.3.1.tar.gz
sha256: b3d8e14d91cc95fb3dbc03a9d0588ac58326803eefa5bbb0978d109de3304fbe
patches:
- patches/fix-build.patch
requirements:
run:

View File

@ -1,12 +0,0 @@
diff --git a/setup.py b/setup.py
index d8c1872a..ad396e02 100644
--- a/setup.py
+++ b/setup.py
@@ -167,7 +167,6 @@ def get_extension_modules():
ext_options = {
"include_dirs": include_dirs,
"library_dirs": library_dirs,
- "runtime_library_dirs": library_dirs if os.name != "nt" else None,
"libraries": get_libraries(library_dirs),
}
# setup cythonized modules

View File

@ -301,11 +301,16 @@ def replay_genargs_handle_linker_opts(arg: str) -> str | None:
"--as-needed",
]:
continue
# ignore unsupported --sysroot compile argument used in conda
if opt.startswith("--sysroot="):
continue
if opt.startswith("--version-script="):
if opt.startswith(
(
"--sysroot=", # ignore unsupported --sysroot compile argument used in conda
"--version-script=",
"-R/", # wasm-ld does not accept -R (runtime libraries)
)
):
continue
new_link_opts.append(opt)
if len(new_link_opts) > 1:
return ",".join(new_link_opts)