From 0d93662befb8374685ca58cf45c66e9bdbdc87a0 Mon Sep 17 00:00:00 2001 From: NickVs2015 Date: Tue, 28 Jul 2026 20:39:27 +0300 Subject: [PATCH 1/2] fix: pin go/1.23.12 for openvpn-pt-android to avoid android/arm crash --- cmake/recipes_bootstrap.cmake | 8 ++++++++ recipes/go/conandata.yml | 25 +++++++++++++++++++++++++ recipes/go/conanfile.py | 5 +++-- recipes/openvpn-pt-android/conanfile.py | 2 +- 4 files changed, 37 insertions(+), 3 deletions(-) diff --git a/cmake/recipes_bootstrap.cmake b/cmake/recipes_bootstrap.cmake index a4deaffa95..adc5fd1a50 100644 --- a/cmake/recipes_bootstrap.cmake +++ b/cmake/recipes_bootstrap.cmake @@ -5,6 +5,7 @@ find_program(CONAN_COMMAND "conan" REQUIRED ) file(GLOB_RECURSE LOCAL_RECIPES "${CMAKE_SOURCE_DIR}/recipes/*/conanfile.py") +list(REMOVE_ITEM LOCAL_RECIPES "${CMAKE_SOURCE_DIR}/recipes/go/conanfile.py") foreach(RECIPE ${LOCAL_RECIPES}) get_filename_component(RECIPE_DIR ${RECIPE} DIRECTORY) execute_process( @@ -12,6 +13,13 @@ foreach(RECIPE ${LOCAL_RECIPES}) ) endforeach() +execute_process( + COMMAND ${CONAN_COMMAND} export "${CMAKE_SOURCE_DIR}/recipes/go" --version 1.26.0 +) +execute_process( + COMMAND ${CONAN_COMMAND} export "${CMAKE_SOURCE_DIR}/recipes/go" --version 1.23.12 +) + execute_process( COMMAND ${CONAN_COMMAND} remote add amnezia "https://artifactory.amnezia.org/artifactory/api/conan/client-prebuilts" --force ) diff --git a/recipes/go/conandata.yml b/recipes/go/conandata.yml index 1507e54bef..20b7067d25 100644 --- a/recipes/go/conandata.yml +++ b/recipes/go/conandata.yml @@ -1,4 +1,29 @@ sources: + "1.23.12": + Macos: + x86_64: + url: "https://go.dev/dl/go1.23.12.darwin-amd64.tar.gz" + sha256: "0f6efdc3ffc6f03b230016acca0aef43c229de022d0ff401e7aa4ad4862eca8e" + armv8: + url: "https://go.dev/dl/go1.23.12.darwin-arm64.tar.gz" + sha256: "5bfa117e401ae64e7ffb960243c448b535fe007e682a13ff6c7371f4a6f0ccaa" + Linux: + x86: + url: "https://go.dev/dl/go1.23.12.linux-386.tar.gz" + sha256: "3b2fd446e26642555d1446a38ccbefb2a30bba3179d3ef132ed64d3c63b0c42a" + x86_64: + url: "https://go.dev/dl/go1.23.12.linux-amd64.tar.gz" + sha256: "d3847fef834e9db11bf64e3fb34db9c04db14e068eeb064f49af747010454f90" + armv8: + url: "https://go.dev/dl/go1.23.12.linux-arm64.tar.gz" + sha256: "52ce172f96e21da53b1ae9079808560d49b02ac86cecfa457217597f9bc28ab3" + Windows: + x86: + url: "https://go.dev/dl/go1.23.12.windows-386.zip" + sha256: "9be6415e04270cdd35761f97bcab6506feb421715dc6453dd1322c8e7bcde67a" + x86_64: + url: "https://go.dev/dl/go1.23.12.windows-amd64.zip" + sha256: "07c35866cdd864b81bb6f1cfbf25ac7f87ddc3a976ede1bf5112acbb12dfe6dc" "1.26.0": Macos: x86_64: diff --git a/recipes/go/conanfile.py b/recipes/go/conanfile.py index 9872b72389..fc47c33440 100644 --- a/recipes/go/conanfile.py +++ b/recipes/go/conanfile.py @@ -6,8 +6,9 @@ class Golang(ConanFile): name = "go" - version = "1.26.0" - + # No fixed version: openvpn-pt-android pins go/1.23.x (android/arm futex_time64 + # regression in go>=1.24, golang/go#77930) — versions are exported explicitly + # in recipes_bootstrap.cmake. settings = "os", "arch" def layout(self): diff --git a/recipes/openvpn-pt-android/conanfile.py b/recipes/openvpn-pt-android/conanfile.py index c9010f0b22..544b3107de 100644 --- a/recipes/openvpn-pt-android/conanfile.py +++ b/recipes/openvpn-pt-android/conanfile.py @@ -20,7 +20,7 @@ def layout(self): def build_requirements(self): self.tool_requires("swig/4.1.1") - self.tool_requires("go/1.26.0") + self.tool_requires("go/1.23.12") self.tool_requires("cmake/[>=3.4.1 <4]") def validate(self): From bdaed40c417a01175015cb916fdc48995bfccc89 Mon Sep 17 00:00:00 2001 From: Yaroslav Gurov Date: Wed, 29 Jul 2026 14:51:12 +0200 Subject: [PATCH 2/2] chore: add fixme annotation --- cmake/recipes_bootstrap.cmake | 1 + 1 file changed, 1 insertion(+) diff --git a/cmake/recipes_bootstrap.cmake b/cmake/recipes_bootstrap.cmake index adc5fd1a50..590396f963 100644 --- a/cmake/recipes_bootstrap.cmake +++ b/cmake/recipes_bootstrap.cmake @@ -13,6 +13,7 @@ foreach(RECIPE ${LOCAL_RECIPES}) ) endforeach() +# FIXME(ygurov): export all versions declared on recipies_bootstrap call execute_process( COMMAND ${CONAN_COMMAND} export "${CMAKE_SOURCE_DIR}/recipes/go" --version 1.26.0 )