已开启
[sync] PR-15: Patch golang verison for openEuler24.03 #19
AtomGit-Bot创建于 2025年8月11日
[sync] PR-15: Patch golang verison for openEuler24.03 #19
已开启
共 2 个文件变更+20-1
| @@ -42,7 +42,7 @@ | |||
| 42 | Summary: Application and environment virtualization formerly known as Singularity | 42 | Summary: Application and environment virtualization formerly known as Singularity |
| 43 | Name: apptainer | 43 | Name: apptainer |
| 44 | Version: 1.1.6 | 44 | Version: 1.1.6 |
| 45 | -Release: 2 | 45 | +Release: 3 |
| 46 | # See LICENSE.md for first party code (BSD-3-Clause and LBNL BSD) | 46 | # See LICENSE.md for first party code (BSD-3-Clause and LBNL BSD) |
| 47 | # See LICENSE_THIRD_PARTY.md for incorporated code (ASL 2.0) | 47 | # See LICENSE_THIRD_PARTY.md for incorporated code (ASL 2.0) |
| 48 | # See LICENSE_DEPENDENCIES.md for dependencies | 48 | # See LICENSE_DEPENDENCIES.md for dependencies |
| @@ -58,6 +58,7 @@ Patch11: 77.patch | |||
| 58 | Patch12: 81.patch | 58 | Patch12: 81.patch |
| 59 | %endif | 59 | %endif |
| 60 | Patch13: add-loong64-support-for-bbolt.patch | 60 | Patch13: add-loong64-support-for-bbolt.patch |
| 61 | +Patch14: openEuler-golang-1.21.4.patch | ||
| 61 | 62 | ||
| 62 | # This Conflicts is in case someone tries to install the main apptainer | 63 | # This Conflicts is in case someone tries to install the main apptainer |
| 63 | # package when an old singularity package is installed. An Obsoletes is on | 64 | # package when an old singularity package is installed. An Obsoletes is on |
| @@ -434,6 +435,9 @@ fi | |||
| 434 | %attr(4755, root, root) %{_libexecdir}/%{name}/bin/starter-suid | 435 | %attr(4755, root, root) %{_libexecdir}/%{name}/bin/starter-suid |
| 435 | 436 | ||
| 436 | %changelog | 437 | %changelog |
| 438 | +* Mon Dec 09 2024 zhengting <zhengting13@huawei.com> - 1.1.6-3 | ||
| 439 | +- Patch golang verison fro openEuler 24.03 | ||
| 440 | + | ||
| 437 | * Tue Oct 15 2024 Wenlong Zhang <zhangwenlong@loongson.cn> - 1.1.6-2 | 441 | * Tue Oct 15 2024 Wenlong Zhang <zhangwenlong@loongson.cn> - 1.1.6-2 |
| 438 | - add loong64 support for bbolt | 442 | - add loong64 support for bbolt |
| 439 | 443 | ||
| @@ -0,0 +1,15 @@ | |||
| 1 | +diff --git a/mconfig b/mconfig | ||
| 2 | +index a29d88e..4b7b386 100755 | ||
| 3 | +--- a/mconfig | ||
| 4 | ++++ b/mconfig | ||
| 5 | + hstld= | ||
| 6 | + hstranlib= | ||
| 7 | + hstobjcopy= | ||
| 8 | + hstgo= | ||
| 9 | +-hstgo_version="1.17.5" | ||
| 10 | +-hstgo_preferred_version="1.17.5" | ||
| 11 | ++hstgo_version="1.21.4" | ||
| 12 | ++hstgo_preferred_version="1.21.4" | ||
| 13 | + hstgo_opts="go" | ||
| 14 | + | ||
| 15 | + tgtcc= | ||