Merge branch 'main' into pycrdt-v0.12.1

emscripten-forge · Jan 9, 2025 · c02d046 · c02d046
2 parents 9f09bef + 4e5ce8c
commit c02d046
Show file tree

Hide file tree

Showing 6 changed files with 76 additions and 58 deletions.
diff --git a/recipes/recipes_emscripten/cppinterop/build.sh b/recipes/recipes_emscripten/cppinterop/build.sh
@@ -6,13 +6,12 @@ export CMAKE_SYSTEM_PREFIX_PATH=$PREFIX
 
 # Configure step
 emcmake cmake -DCMAKE_BUILD_TYPE=Release               \
-    -DCMAKE_PREFIX_PATH=$PREFIX                         \
-    -DLLVM_DIR=$PREFIX                                  \
-    -DLLD_DIR=$PREFIX                                  \
-    -DClang_DIR=$PREFIX                                 \
+    -DCMAKE_PREFIX_PATH=$PREFIX                        \
+    -DLLVM_DIR=$PREFIX/lib/cmake/llvm                  \
+    -DLLD_DIR=$PREFIX/lib/cmake/lld                    \
+    -DClang_DIR=$PREFIX/lib/cmake/clang                \
     -DBUILD_SHARED_LIBS=ON                             \
-    -DCMAKE_INSTALL_PREFIX=$PREFIX                      \
-    -DCMAKE_FIND_ROOT_PATH_MODE_PACKAGE=ON              \
+    -DCMAKE_INSTALL_PREFIX=$PREFIX                     \
     ../
 
 # Build step

diff --git a/recipes/recipes_emscripten/cppinterop/patches/__clang_Interpreter_SetValueNoAlloc.patch b/recipes/recipes_emscripten/cppinterop/patches/__clang_Interpreter_SetValueNoAlloc.patch
@@ -0,0 +1,16 @@
+diff --git a/lib/Interpreter/CMakeLists.txt b/lib/Interpreter/CMakeLists.txt
+index 103b331..8d0dd97 100644
+--- a/lib/Interpreter/CMakeLists.txt
++++ b/lib/Interpreter/CMakeLists.txt
+@@ -17,6 +17,11 @@ if(EMSCRIPTEN)
+     LINK_LIBS
+     clangInterpreter
+   )
++
++  target_link_options(clangCppInterOp PRIVATE
++    PUBLIC "SHELL: -s WASM_BIGINT"
++    PUBLIC "SHELL: -Wl,--export=__clang_Interpreter_SetValueNoAlloc"
++  )
+ else()
+   set(LLVM_LINK_COMPONENTS
+     ${LLVM_TARGETS_TO_BUILD}
diff --git a/recipes/recipes_emscripten/cppinterop/recipe.yaml b/recipes/recipes_emscripten/cppinterop/recipe.yaml
@@ -8,9 +8,11 @@ package:
 source:
   url: https://github.com/compiler-research/CppInterOp/archive/refs/tags/v${{ version }}.tar.gz
   sha256: d29d610adeb23820533a456714c795de4e458153e04a003d26ac8b0326a3469f
+  patches:
+  - patches/__clang_Interpreter_SetValueNoAlloc.patch
 
 build:
-  number: 0
+  number: 1
 
 requirements:
   build:

diff --git a/recipes/recipes_emscripten/libpng/recipe.yaml b/recipes/recipes_emscripten/libpng/recipe.yaml
@@ -1,14 +1,15 @@
 context:
   name: libpng
-  version: 1.6.44
+  version: 1.6.45
 
 package:
   name: ${{ name }}
   version: ${{ version }}
 
 source:
-  url: http://downloads.sourceforge.net/project/${{ name }}/libpng16/${{ version }}/${{ name }}-${{ version }}.tar.gz
-  sha256: 8c25a7792099a0089fa1cc76c94260d0bb3f1ec52b93671b572f8bb61577b732
+  url: http://downloads.sourceforge.net/project/${{ name }}/libpng16/${{ version }}/${{
+    name }}-${{ version }}.tar.gz
+  sha256: 7dee9e1ca8152bf52f919456f4190330aee48209887f2ec0b3d9f0ad571df11b
 
 build:
   number: 1
@@ -30,7 +31,7 @@ tests:
     include:
     - png.h
 - script:
-    - libpng-config --version
+  - libpng-config --version
 
 about:
   license: zlib-acknowledgement
@@ -45,4 +46,4 @@ about:
 extra:
   recipe-maintainers:
   - martinRenou
-  - IsabelParedes
+  - IsabelParedes
diff --git a/recipes/recipes_emscripten/pyjs/recipe.yaml b/recipes/recipes_emscripten/pyjs/recipe.yaml
@@ -1,13 +1,13 @@
 context:
-  version: 2.4.0
+  version: 2.4.1
   name: pyjs
 package:
   name: ${{name}}
   version: ${{ version }}
-    
+
 source:
   url: https://github.com/emscripten-forge/pyjs/archive/refs/tags/${{ version }}.tar.gz
-  sha256:   f99ccde0b025efe76dd21243534660f231881fdff969b811b215406096a9488e
+  sha256: 9ff1655a1d070bfd44f16ad3d1599ca2c575ea67241e44697de8468d8f917459
 build:
   number: 0
 
@@ -28,48 +28,48 @@ requirements:
   - pybind11<2.12.0
 
 tests:
-  - script: |
-      echo "install playwright"
-      playwright install
-      echo "test in browser (main thread)"
-      pyjs_code_runner run script \
-          browser-main \
-          --conda-env     $PREFIX \
-          --mount         $(pwd)/tests:/tests \
-          --script        main.py \
-          --work-dir      /tests \
-          --headless \
-          --async-main \
-          --no-cache
-      # worker
-      echo "test in browser (worker thread)"
-      pyjs_code_runner run script \
-          browser-worker \
-          --conda-env     $PREFIX \
-          --mount         $(pwd)/tests:/tests \
-          --script        main.py \
-          --work-dir      /tests \
-          --headless \
-          --async-main \
-          --no-cache
+- script: |
+    echo "install playwright"
+    playwright install
+    echo "test in browser (main thread)"
+    pyjs_code_runner run script \
+        browser-main \
+        --conda-env     $PREFIX \
+        --mount         $(pwd)/tests:/tests \
+        --script        main.py \
+        --work-dir      /tests \
+        --headless \
+        --async-main \
+        --no-cache
+    # worker
+    echo "test in browser (worker thread)"
+    pyjs_code_runner run script \
+        browser-worker \
+        --conda-env     $PREFIX \
+        --mount         $(pwd)/tests:/tests \
+        --script        main.py \
+        --work-dir      /tests \
+        --headless \
+        --async-main \
+        --no-cache
 
-    requirements:
-      build:      
-          - pytester
-          - if: build_platform == "linux-64"
-            then:
-              - pyjs_code_runner >=3.0.0
-              - microsoft::playwright <1.42
-            else:
-              - pyjs_code_runner >=3.0.0
-              - microsoft::playwright
-      run:
-        - pytest
-        - numpy<2
-        - python<3.12
-    files:
-      source:
-        - tests/**/*
+  requirements:
+    build:
+    - pytester
+    - if: build_platform == "linux-64"
+      then:
+      - pyjs_code_runner >=3.0.0
+      - microsoft::playwright <1.42
+      else:
+      - pyjs_code_runner >=3.0.0
+      - microsoft::playwright
+    run:
+    - pytest
+    - numpy<2
+    - python<3.12
+  files:
+    source:
+    - tests/**/*
 
 
 about:

diff --git a/recipes/recipes_emscripten/wheel/recipe.yaml b/recipes/recipes_emscripten/wheel/recipe.yaml
@@ -1,5 +1,5 @@
 context:
-  version: 0.45.0
+  version: 0.45.1
   name: wheel
 
 package:
@@ -8,7 +8,7 @@ package:
 
 source:
 - url: https://pypi.io/packages/source/w/${{name}}/${{name}}-${{ version }}.tar.gz
-  sha256: a57353941a3183b3d5365346b567a260a0602a0f8a635926a7dede41b94c674a
+  sha256: 661e1abd9198507b1409a20c02106d9670b2576e916d58f520316666abca6729
 
 build:
   number: 0