From 1b4b0289936c247daa5d7a4f515a983b3f85a3b8 Mon Sep 17 00:00:00 2001
From: Gyeongjae Choi <def6488@gmail.com>
Date: Sun, 10 Jul 2022 19:11:03 +0900
Subject: [PATCH] BLD Ignore runtime lib flag on linking (#2848)

---
 packages/h5py/meta.yaml                    |  1 -
 packages/h5py/patches/build.patch          | 13 -------------
 packages/pyproj/meta.yaml                  |  2 --
 packages/pyproj/patches/fix-build.patch    | 12 ------------
 pyodide-build/pyodide_build/pywasmcross.py | 13 +++++++++----
 5 files changed, 9 insertions(+), 32 deletions(-)
 delete mode 100644 packages/h5py/patches/build.patch
 delete mode 100644 packages/pyproj/patches/fix-build.patch

diff --git a/packages/h5py/meta.yaml b/packages/h5py/meta.yaml
index 74f84109f..90026247b 100644
--- a/packages/h5py/meta.yaml
+++ b/packages/h5py/meta.yaml
@@ -7,7 +7,6 @@ source:
   sha256: 3fcf37884383c5da64846ab510190720027dca0768def34dd8dcb659dbe5cbf3
   patches:
     - patches/configure.patch
-    - patches/build.patch
 
 requirements:
   run:
diff --git a/packages/h5py/patches/build.patch b/packages/h5py/patches/build.patch
deleted file mode 100644
index d5932940b..000000000
--- a/packages/h5py/patches/build.patch
+++ /dev/null
@@ -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):
diff --git a/packages/pyproj/meta.yaml b/packages/pyproj/meta.yaml
index f637d8a8e..a51b0e36a 100644
--- a/packages/pyproj/meta.yaml
+++ b/packages/pyproj/meta.yaml
@@ -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:
diff --git a/packages/pyproj/patches/fix-build.patch b/packages/pyproj/patches/fix-build.patch
deleted file mode 100644
index c4f5fc117..000000000
--- a/packages/pyproj/patches/fix-build.patch
+++ /dev/null
@@ -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
diff --git a/pyodide-build/pyodide_build/pywasmcross.py b/pyodide-build/pyodide_build/pywasmcross.py
index 5751e91bb..fd93c6a8d 100755
--- a/pyodide-build/pyodide_build/pywasmcross.py
+++ b/pyodide-build/pyodide_build/pywasmcross.py
@@ -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)