Skip to content

Commit 0616dd5

Browse files
Don't hardcode zlib paths in patch details
1 parent 731c6b2 commit 0616dd5

File tree

2 files changed

+12
-10
lines changed

2 files changed

+12
-10
lines changed

.github/workflows/ci-emscripten.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ jobs:
5959
- name: Apply necessary patch(es)
6060
run: |
6161
patch -p1 < tools/ci/patches/0001-disable-multiprocessing-and-pthreads.patch
62-
patch -p1 < tools/ci/patches/0002-add-missing-unistd-headers.patch
62+
patch -p1 < tools/ci/patches/0002-add-missing-unistd-headers.patch -d c-blosc/internal-complibs/zlib-*/
6363
6464
- name: Install pyodide-build
6565
run: python -m pip install pyodide-build

tools/ci/patches/0002-add-missing-unistd-headers.patch

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,13 @@ Pyodide repository at the following link;
44

55
https://github.com/pyodide/pyodide/blob/d32e376013d8977b66c6aa828042b1fee8047aea/packages/numcodecs/patches/fixzlib.patch
66

7+
This patch is applied in the c-blosc/internal-complibs/zlib-<ZLIB_VERSION>/ directory
8+
in the .github/workflows/ci-emscripten.yaml workflow file.
79

8-
diff --git a/c-blosc/internal-complibs/zlib-1.2.13/gzlib.c b/c-blosc/internal-complibs/zlib-1.2.13/gzlib.c
10+
diff --git a/gzlib.c b/gzlib.c
911
index fae202e..80606a6 100644
10-
--- a/c-blosc/internal-complibs/zlib-1.2.13/gzlib.c
11-
+++ b/c-blosc/internal-complibs/zlib-1.2.13/gzlib.c
12+
--- a/gzlib.c
13+
+++ b/gzlib.c
1214
@@ -2,7 +2,7 @@
1315
* Copyright (C) 2004, 2010, 2011, 2012, 2013 Mark Adler
1416
* For conditions of distribution and use, see copyright notice in zlib.h
@@ -19,10 +21,10 @@ index fae202e..80606a6 100644
1921

2022
#if defined(_WIN32) && !defined(__BORLANDC__)
2123

22-
diff --git a/c-blosc/internal-complibs/zlib-1.2.13/gzread.c b/c-blosc/internal-complibs/zlib-1.2.13/gzread.c
24+
diff --git a/gzread.c b/gzread.c
2325
index bf4538e..afe6acd 100644
24-
--- a/c-blosc/internal-complibs/zlib-1.2.13/gzread.c
25-
+++ b/c-blosc/internal-complibs/zlib-1.2.13/gzread.c
26+
--- a/gzread.c
27+
+++ b/gzread.c
2628
@@ -2,7 +2,7 @@
2729
* Copyright (C) 2004, 2005, 2010, 2011, 2012, 2013 Mark Adler
2830
* For conditions of distribution and use, see copyright notice in zlib.h
@@ -34,10 +36,10 @@ index bf4538e..afe6acd 100644
3436
/* Local functions */
3537

3638

37-
diff --git a/c-blosc/internal-complibs/zlib-1.2.13/gzwrite.c b/c-blosc/internal-complibs/zlib-1.2.13/gzwrite.c
39+
diff --git a/gzwrite.c b/gzwrite.c
3840
index aa767fb..a87676f 100644
39-
--- a/c-blosc/internal-complibs/zlib-1.2.13/gzwrite.c
40-
+++ b/c-blosc/internal-complibs/zlib-1.2.13/gzwrite.c
41+
--- a/gzwrite.c
42+
+++ b/gzwrite.c
4143
@@ -2,7 +2,7 @@
4244
* Copyright (C) 2004, 2005, 2010, 2011, 2012, 2013 Mark Adler
4345
* For conditions of distribution and use, see copyright notice in zlib.h

0 commit comments

Comments
 (0)