已开启
[sync] PR-38: remove unused patch1 #40
AtomGit-Bot创建于 2025年2月27日
[sync] PR-38: remove unused patch1 #40
已开启
共 2 个文件变更+4-67
| @@ -1,64 +0,0 @@ | |||
| 1 | -diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/java/jdk.WORKSPACE b/src/main/java/com/google/devtools/build/lib/bazel/rules/java/jdk.WORKSPACE | ||
| 2 | -index a507f04..3be7b84 100755 | ||
| 3 | ---- a/src/main/java/com/google/devtools/build/lib/bazel/rules/java/jdk.WORKSPACE | ||
| 4 | -+++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/java/jdk.WORKSPACE | ||
| 5 | - maybe( | ||
| 6 | - version = "11", | ||
| 7 | - ) | ||
| 8 | - | ||
| 9 | -+# This must be kept in sync with the top-level WORKSPACE file. | ||
| 10 | -+maybe( | ||
| 11 | -+ remote_java_repository, | ||
| 12 | -+ name = "remotejdk11_linux_riscv64", | ||
| 13 | -+ exec_compatible_with = [ | ||
| 14 | -+ "@platforms//os:linux", | ||
| 15 | -+ "@platforms//cpu:riscv64", | ||
| 16 | -+ ], | ||
| 17 | -+ strip_prefix = "java-11-openjdk", | ||
| 18 | -+ urls = [ | ||
| 19 | -+ "file:///build/bazel/src/remotejdk11_linux_riscv64.tar.gz", | ||
| 20 | -+ ], | ||
| 21 | -+ version = "11", | ||
| 22 | -+) | ||
| 23 | -+ | ||
| 24 | - # This must be kept in sync with the top-level WORKSPACE file. | ||
| 25 | - maybe( | ||
| 26 | - remote_java_repository, | ||
| 27 | -diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/java/jdk.WORKSPACE.tmpl b/src/main/java/com/google/devtools/build/lib/bazel/rules/java/jdk.WORKSPACE.tmpl | ||
| 28 | -index 7040eae..b783308 100755 | ||
| 29 | ---- a/src/main/java/com/google/devtools/build/lib/bazel/rules/java/jdk.WORKSPACE.tmpl | ||
| 30 | -+++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/java/jdk.WORKSPACE.tmpl | ||
| 31 | - maybe( | ||
| 32 | - version = "11", | ||
| 33 | - ) | ||
| 34 | - | ||
| 35 | -+# This must be kept in sync with the top-level WORKSPACE file. | ||
| 36 | -+maybe( | ||
| 37 | -+ remote_java_repository, | ||
| 38 | -+ name = "remotejdk11_linux_riscv64", | ||
| 39 | -+ exec_compatible_with = [ | ||
| 40 | -+ "@platforms//os:linux", | ||
| 41 | -+ "@platforms//cpu:riscv64", | ||
| 42 | -+ ], | ||
| 43 | -+ strip_prefix = "java-11-openjdk", | ||
| 44 | -+ urls = [ | ||
| 45 | -+ "file:///build/bazel/src/remotejdk11_linux_riscv64.tar.gz", | ||
| 46 | -+ ], | ||
| 47 | -+ version = "11", | ||
| 48 | -+) | ||
| 49 | -+ | ||
| 50 | - # This must be kept in sync with the top-level WORKSPACE file. | ||
| 51 | - maybe( | ||
| 52 | - remote_java_repository, | ||
| 53 | -diff --git a/tools/jdk/BUILD.tools b/tools/jdk/BUILD.tools | ||
| 54 | -index ecddfe0..85cb7b0 100755 | ||
| 55 | ---- a/tools/jdk/BUILD.tools | ||
| 56 | -+++ b/tools/jdk/BUILD.tools | ||
| 57 | - _JDKS = [ | ||
| 58 | - "remotejdk11_linux", | ||
| 59 | - "remotejdk11_linux_ppc64le", | ||
| 60 | - "remotejdk11_linux_s390x", | ||
| 61 | -+ "remotejdk11_linux_riscv64", | ||
| 62 | - "remotejdk15_macos", | ||
| 63 | - "remotejdk15_macos_aarch64", | ||
| 64 | - "remotejdk15_win", | ||
| @@ -2,14 +2,13 @@ | |||
| 2 | 2 | ||
| 3 | Name: bazel | 3 | Name: bazel |
| 4 | Version: 5.3.0 | 4 | Version: 5.3.0 |
| 5 | -Release: 2 | 5 | +Release: 3 |
| 6 | Summary: Correct, reproducible, and fast builds for everyone. | 6 | Summary: Correct, reproducible, and fast builds for everyone. |
| 7 | License: Apache License 2.0 | 7 | License: Apache License 2.0 |
| 8 | URL: http://bazel.io/ | 8 | URL: http://bazel.io/ |
| 9 | Source0: https://github.com/bazelbuild/bazel/releases/download/%{version}/bazel-%{version}-dist.zip | 9 | Source0: https://github.com/bazelbuild/bazel/releases/download/%{version}/bazel-%{version}-dist.zip |
| 10 | Source1: abseil-cpp-riscv.patch | 10 | Source1: abseil-cpp-riscv.patch |
| 11 | Patch0: 01-fix-invalid-jni_md-select.patch | 11 | Patch0: 01-fix-invalid-jni_md-select.patch |
| 12 | -Patch1: 02-use-riscv64-jdk.patch | ||
| 13 | Patch2: 03-set-default-nojdk.patch | 12 | Patch2: 03-set-default-nojdk.patch |
| 14 | Patch3: linux-bazel-path-from-getauxval.patch | 13 | Patch3: linux-bazel-path-from-getauxval.patch |
| 15 | Patch4: 04-riscv-distdir_deps.patch | 14 | Patch4: 04-riscv-distdir_deps.patch |
| @@ -32,7 +31,6 @@ Correct, reproducible, and fast builds for everyone. | |||
| 32 | %prep | 31 | %prep |
| 33 | %setup -q -c -n bazel-%{version} | 32 | %setup -q -c -n bazel-%{version} |
| 34 | %patch0 -p1 | 33 | %patch0 -p1 |
| 35 | -#%patch1 -p1 | ||
| 36 | %patch2 -p1 | 34 | %patch2 -p1 |
| 37 | %patch3 -p1 | 35 | %patch3 -p1 |
| 38 | %ifarch riscv64 | 36 | %ifarch riscv64 |
| @@ -99,6 +97,9 @@ env ./scripts/generate_bash_completion.sh --bazel=output/bazel --output=output/b | |||
| 99 | %attr(0755,root,root) %{bashcompdir}/bazel | 97 | %attr(0755,root,root) %{bashcompdir}/bazel |
| 100 | 98 | ||
| 101 | %changelog | 99 | %changelog |
| 100 | +* Wed Feb 19 2025 laokz <zhangkai@iscas.ac.cn> - 5.3.0-3 | ||
| 101 | +- remove unused patch1 | ||
| 102 | + | ||
| 102 | * Tue Jul 09 2024 laokz <zhangkai@iscas.ac.cn> - 5.3.0-2 | 103 | * Tue Jul 09 2024 laokz <zhangkai@iscas.ac.cn> - 5.3.0-2 |
| 103 | - riscv64: fix 'rdcycle' SIGILL of dependency abseil-cpp | 104 | - riscv64: fix 'rdcycle' SIGILL of dependency abseil-cpp |
| 104 | 105 | ||