Skip to content

Commit 30ec46a

Browse files
NickVs2015ygurov
andauthored
fix: openvpn runtime futex error (#2894)
* fix: pin go/1.23.12 for openvpn-pt-android to avoid android/arm crash * chore: add fixme annotation --------- Co-authored-by: Yaroslav Gurov <ygurov@proton.me>
1 parent 4055e1b commit 30ec46a

4 files changed

Lines changed: 38 additions & 3 deletions

File tree

cmake/recipes_bootstrap.cmake

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,22 @@ find_program(CONAN_COMMAND "conan" REQUIRED
55
)
66

77
file(GLOB_RECURSE LOCAL_RECIPES "${CMAKE_SOURCE_DIR}/recipes/*/conanfile.py")
8+
list(REMOVE_ITEM LOCAL_RECIPES "${CMAKE_SOURCE_DIR}/recipes/go/conanfile.py")
89
foreach(RECIPE ${LOCAL_RECIPES})
910
get_filename_component(RECIPE_DIR ${RECIPE} DIRECTORY)
1011
execute_process(
1112
COMMAND ${CONAN_COMMAND} export ${RECIPE_DIR}
1213
)
1314
endforeach()
1415

16+
# FIXME(ygurov): export all versions declared on recipies_bootstrap call
17+
execute_process(
18+
COMMAND ${CONAN_COMMAND} export "${CMAKE_SOURCE_DIR}/recipes/go" --version 1.26.0
19+
)
20+
execute_process(
21+
COMMAND ${CONAN_COMMAND} export "${CMAKE_SOURCE_DIR}/recipes/go" --version 1.23.12
22+
)
23+
1524
execute_process(
1625
COMMAND ${CONAN_COMMAND} remote add amnezia "https://artifactory.amnezia.org/artifactory/api/conan/client-prebuilts" --force
1726
)

recipes/go/conandata.yml

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,29 @@
11
sources:
2+
"1.23.12":
3+
Macos:
4+
x86_64:
5+
url: "https://go.dev/dl/go1.23.12.darwin-amd64.tar.gz"
6+
sha256: "0f6efdc3ffc6f03b230016acca0aef43c229de022d0ff401e7aa4ad4862eca8e"
7+
armv8:
8+
url: "https://go.dev/dl/go1.23.12.darwin-arm64.tar.gz"
9+
sha256: "5bfa117e401ae64e7ffb960243c448b535fe007e682a13ff6c7371f4a6f0ccaa"
10+
Linux:
11+
x86:
12+
url: "https://go.dev/dl/go1.23.12.linux-386.tar.gz"
13+
sha256: "3b2fd446e26642555d1446a38ccbefb2a30bba3179d3ef132ed64d3c63b0c42a"
14+
x86_64:
15+
url: "https://go.dev/dl/go1.23.12.linux-amd64.tar.gz"
16+
sha256: "d3847fef834e9db11bf64e3fb34db9c04db14e068eeb064f49af747010454f90"
17+
armv8:
18+
url: "https://go.dev/dl/go1.23.12.linux-arm64.tar.gz"
19+
sha256: "52ce172f96e21da53b1ae9079808560d49b02ac86cecfa457217597f9bc28ab3"
20+
Windows:
21+
x86:
22+
url: "https://go.dev/dl/go1.23.12.windows-386.zip"
23+
sha256: "9be6415e04270cdd35761f97bcab6506feb421715dc6453dd1322c8e7bcde67a"
24+
x86_64:
25+
url: "https://go.dev/dl/go1.23.12.windows-amd64.zip"
26+
sha256: "07c35866cdd864b81bb6f1cfbf25ac7f87ddc3a976ede1bf5112acbb12dfe6dc"
227
"1.26.0":
328
Macos:
429
x86_64:

recipes/go/conanfile.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,9 @@
66

77
class Golang(ConanFile):
88
name = "go"
9-
version = "1.26.0"
10-
9+
# No fixed version: openvpn-pt-android pins go/1.23.x (android/arm futex_time64
10+
# regression in go>=1.24, golang/go#77930) — versions are exported explicitly
11+
# in recipes_bootstrap.cmake.
1112
settings = "os", "arch"
1213

1314
def layout(self):

recipes/openvpn-pt-android/conanfile.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ def layout(self):
2020

2121
def build_requirements(self):
2222
self.tool_requires("swig/4.1.1")
23-
self.tool_requires("go/1.26.0")
23+
self.tool_requires("go/1.23.12")
2424
self.tool_requires("cmake/[>=3.4.1 <4]")
2525

2626
def validate(self):

0 commit comments

Comments
 (0)