Skip to content

Commit 9b9b1d3

Browse files
msimacekmsimacek
committed
Fix patch paths in other patches
1 parent 34723f2 commit 9b9b1d3

File tree

6 files changed

+14
-11
lines changed

6 files changed

+14
-11
lines changed

‎graalpython/lib-graalpython/patches/metadata.toml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,8 @@ license = 'Apache-2.0'
111111

112112
[[Cython.rules]]
113113
version = '== 0.29.32'
114+
# Also referenced outside of pip in ray patches
115+
# Also referenced outside of pip in tensorflow patches
114116
patch = 'Cython-0.29.32.patch'
115117
license = 'Apache-2.0'
116118

@@ -406,6 +408,7 @@ license = 'BSD-3-Clause'
406408

407409
[[protobuf.rules]]
408410
version = '== 3.21.9'
411+
# Also referenced outside of pip from tensorflow patches
409412
patch = 'protobuf-3.21.9.patch'
410413
license = 'BSD-3-Clause'
411414

‎graalpython/lib-graalpython/patches/onnxruntime-1.17.1.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ index 0000000..33fc235
6666
+ subprocess.check_call([sys.executable, '-m', 'autopatch_capi', '.'])
6767
+ pybind11_dir = build_dir / '_deps/pybind11_project-src'
6868
+ patches_dir = Path(__graalpython__.core_home) / 'patches'
69-
+ with open(patches_dir / 'pybind11' / 'pybind11-2.10.1.patch') as f:
69+
+ with open(patches_dir / 'pybind11-2.10.1.patch') as f:
7070
+ subprocess.check_call(['patch', '-p2', '-f'], stdin=f, cwd=pybind11_dir)
7171
+ with open(marker, 'w') as f:
7272
+ pass

‎graalpython/lib-graalpython/patches/ray-2.3.0.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ index 63f67a9..e870de8 100644
2121
sha256 = "37c466fea398da9785bc37fe16f1455d2645d21a72e402103991d9e2fa1c6ff3",
2222
+ patch_cmds = [
2323
+ 'graalpy -m autopatch_capi .',
24-
+ '''patch -p1 < "$(graalpy -c 'print(__graalpython__.core_home)')/patches/Cython/Cython-0.29.32.patch"''',
24+
+ '''patch -p1 < "$(graalpy -c 'print(__graalpython__.core_home)')/patches/Cython-0.29.32.patch"''',
2525
+ ],
2626
)
2727

‎graalpython/lib-graalpython/patches/ray-2.9.1.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ index f91eb303c4..b0d11eafe6 100644
5555
sha256 = "37c466fea398da9785bc37fe16f1455d2645d21a72e402103991d9e2fa1c6ff3",
5656
+ patch_cmds = [
5757
+ 'graalpy -m autopatch_capi .',
58-
+ '''patch -p1 < "$(graalpy -c 'print(__graalpython__.core_home)')/patches/Cython/Cython-0.29.32.patch"''',
58+
+ '''patch -p1 < "$(graalpy -c 'print(__graalpython__.core_home)')/patches/Cython-0.29.32.patch"''',
5959
+ ],
6060
)
6161

‎graalpython/lib-graalpython/patches/tensorflow-2.14.0.patch

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -322,7 +322,7 @@ index 00000000..b8336892
322322
+ "benchmark-f7547e29ccaed7b64ef4f7495ecfff1c9f6f3d03": None,
323323
+ "grpc-b54a5b338637f92bfcf4b0bc05e0f57a5fd8fadd": None,
324324
+ "upb-9effcbcb27f0a665f9f345030188c0b291e32482": None,
325-
+ "protobuf-3.21.9": Patch(os.path.join(PATCHES_BASE_DIR, 'protobuf', 'protobuf-3.21.9.patch')),
325+
+ "protobuf-3.21.9": Patch(os.path.join(PATCHES_BASE_DIR, 'protobuf-3.21.9.patch')),
326326
+ "googleapis-6b3fdcea8bc5398be4e7e9930c693f0ea09316a0": None,
327327
+ "rules_android-0.1.1": None,
328328
+ "flatbuffers-23.1.21": None,
@@ -336,7 +336,7 @@ index 00000000..b8336892
336336
+ "termcolor-1.1.0": None,
337337
+ "astunparse-1.6.3/lib": None,
338338
+ "FXdiv-63058eff77e11aa15bf531df5dd34395ec3017c8": None,
339-
+ "dill-0.3.6": Patch(os.path.join(PATCHES_BASE_DIR, 'dill', 'dill.patch')),
339+
+ "dill-0.3.6": None,
340340
+ "farmhash-0d859a811870d10f53a594927d0d0b97573ad06d": None,
341341
+ "pasta-0.2.0": None,
342342
+ "giflib-5.2.1": None,
@@ -369,9 +369,9 @@ index 00000000..b8336892
369369
+ "icu-release-69-1": None,
370370
+ "pybind11_protobuf-80f3440cd8fee124e077e2e47a8a17b78b451363": None,
371371
+ "pybind11_abseil-2c4932ed6f6204f1656e245838f4f5eae69d2e29": None,
372-
+ "pybind11-2.10.4": Patch(os.path.join(PATCHES_BASE_DIR, 'pybind11', 'pybind11-2.10.1.patch'), 2),
372+
+ "pybind11-2.10.4": Patch(os.path.join(PATCHES_BASE_DIR, 'pybind11-2.10.1.patch'), 2),
373373
+ "jsoncpp-1.9.5": None,
374-
+ "cython-0.29.32": Patch(os.path.join(PATCHES_BASE_DIR, 'Cython', 'Cython-0.29.32.patch')),
374+
+ "cython-0.29.32": Patch(os.path.join(PATCHES_BASE_DIR, 'Cython-0.29.32.patch')),
375375
+ "sqlite-amalgamation-3400100": None,
376376
+ "pybind11_bazel-72cbbf1fbc830e487e3012862b7b720001b70672": None,
377377
+ "oneDNN-2.7.3": None,

‎graalpython/lib-graalpython/patches/tensorflow-2.15.0.patch

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -348,7 +348,7 @@ index 00000000..b8336892
348348
+ "benchmark-f7547e29ccaed7b64ef4f7495ecfff1c9f6f3d03": None,
349349
+ "grpc-b54a5b338637f92bfcf4b0bc05e0f57a5fd8fadd": None,
350350
+ "upb-9effcbcb27f0a665f9f345030188c0b291e32482": None,
351-
+ "protobuf-3.21.9": Patch(os.path.join(PATCHES_BASE_DIR, 'protobuf', 'protobuf-3.21.9.patch')),
351+
+ "protobuf-3.21.9": Patch(os.path.join(PATCHES_BASE_DIR, 'protobuf-3.21.9.patch')),
352352
+ "googleapis-6b3fdcea8bc5398be4e7e9930c693f0ea09316a0": None,
353353
+ "rules_android-0.1.1": None,
354354
+ "flatbuffers-23.1.21": None,
@@ -362,7 +362,7 @@ index 00000000..b8336892
362362
+ "termcolor-1.1.0": None,
363363
+ "astunparse-1.6.3/lib": None,
364364
+ "FXdiv-63058eff77e11aa15bf531df5dd34395ec3017c8": None,
365-
+ "dill-0.3.6": Patch(os.path.join(PATCHES_BASE_DIR, 'dill', 'dill.patch')),
365+
+ "dill-0.3.6": None,
366366
+ "farmhash-0d859a811870d10f53a594927d0d0b97573ad06d": None,
367367
+ "pasta-0.2.0": None,
368368
+ "giflib-5.2.1": None,
@@ -395,9 +395,9 @@ index 00000000..b8336892
395395
+ "icu-release-69-1": None,
396396
+ "pybind11_protobuf-80f3440cd8fee124e077e2e47a8a17b78b451363": None,
397397
+ "pybind11_abseil-2c4932ed6f6204f1656e245838f4f5eae69d2e29": None,
398-
+ "pybind11-2.10.4": Patch(os.path.join(PATCHES_BASE_DIR, 'pybind11', 'pybind11-2.10.1.patch'), 2),
398+
+ "pybind11-2.10.4": Patch(os.path.join(PATCHES_BASE_DIR, 'pybind11-2.10.1.patch'), 2),
399399
+ "jsoncpp-1.9.5": None,
400-
+ "cython-0.29.32": Patch(os.path.join(PATCHES_BASE_DIR, 'Cython', 'Cython-0.29.32.patch')),
400+
+ "cython-0.29.32": Patch(os.path.join(PATCHES_BASE_DIR, 'Cython-0.29.32.patch')),
401401
+ "sqlite-amalgamation-3400100": None,
402402
+ "pybind11_bazel-72cbbf1fbc830e487e3012862b7b720001b70672": None,
403403
+ "oneDNN-2.7.3": None,

0 commit comments

Comments
 (0)