From 98915b3cf2e8468fee1865f1ed6609af43b2dd10 Mon Sep 17 00:00:00 2001 From: Yaroslav Gurov Date: Fri, 27 Mar 2026 00:22:09 +0100 Subject: [PATCH] chore(conan): recipes cleanup --- recipes/amnezia-xray-bindings/conanfile.py | 4 +--- recipes/awg-apple/conanfile.py | 2 +- recipes/awg-go/conanfile.py | 5 +++-- recipes/awg-windows/conanfile.py | 2 +- recipes/openvpn-pt-android/conanfile.py | 2 +- recipes/tun2socks/conanfile.py | 3 ++- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/recipes/amnezia-xray-bindings/conanfile.py b/recipes/amnezia-xray-bindings/conanfile.py index 9ef74ebeb..7861d3c20 100644 --- a/recipes/amnezia-xray-bindings/conanfile.py +++ b/recipes/amnezia-xray-bindings/conanfile.py @@ -1,10 +1,8 @@ -# conanfile.py from conan import ConanFile from conan.tools.files import get, copy, collect_libs, chdir, rename from conan.tools.layout import basic_layout from conan.errors import ConanInvalidConfiguration from conan.tools.gnu import Autotools, AutotoolsToolchain -from conan.tools.env import Environment import os @@ -63,7 +61,7 @@ class AmneziaXrayBindings(ConanFile): tc.make_args = [ "LIB_ARC=libamnezia_xray.a" ] - env = Environment() + env = tc.environment() env.define("ARCH", self._goarch) env.define("GOARCH", self._goarch) env.define("GOOS", self._goos) diff --git a/recipes/awg-apple/conanfile.py b/recipes/awg-apple/conanfile.py index 4373898de..1b6722f60 100644 --- a/recipes/awg-apple/conanfile.py +++ b/recipes/awg-apple/conanfile.py @@ -1,7 +1,7 @@ from conan import ConanFile from conan.errors import ConanInvalidConfiguration from conan.tools.layout import basic_layout -from conan.tools.files import get, copy, collect_libs, chdir +from conan.tools.files import get, copy, collect_libs from conan.tools.apple import is_apple_os from conan.tools.gnu import AutotoolsToolchain, Autotools diff --git a/recipes/awg-go/conanfile.py b/recipes/awg-go/conanfile.py index e10a546b0..db1e542b7 100644 --- a/recipes/awg-go/conanfile.py +++ b/recipes/awg-go/conanfile.py @@ -3,7 +3,6 @@ from conan.errors import ConanInvalidConfiguration from conan.tools.layout import basic_layout from conan.tools.files import get, copy from conan.tools.gnu import Autotools, AutotoolsToolchain -from conan.tools.env import Environment import os @@ -48,9 +47,11 @@ class AwgGo(ConanFile): def generate(self): tc = AutotoolsToolchain(self) - env = Environment() + env = tc.environment() env.define("GOOS", self._goos) env.define("GOARCH", self._goarch) + env.define("CGO_LDFLAGS", tc.ldflags) + env.define("CGO_CFLAGS", tc.cflags) tc.generate(env) def build(self): diff --git a/recipes/awg-windows/conanfile.py b/recipes/awg-windows/conanfile.py index b20bc6443..49632d276 100644 --- a/recipes/awg-windows/conanfile.py +++ b/recipes/awg-windows/conanfile.py @@ -1,7 +1,7 @@ from conan import ConanFile from conan.tools.layout import basic_layout from conan.errors import ConanInvalidConfiguration -from conan.tools.files import get, copy, chdir, collect_libs +from conan.tools.files import get, copy, chdir from conan.tools.gnu import AutotoolsToolchain import os diff --git a/recipes/openvpn-pt-android/conanfile.py b/recipes/openvpn-pt-android/conanfile.py index aad76984f..14d70174f 100644 --- a/recipes/openvpn-pt-android/conanfile.py +++ b/recipes/openvpn-pt-android/conanfile.py @@ -1,6 +1,6 @@ from conan import ConanFile from conan.tools.cmake import cmake_layout, CMake, CMakeToolchain -from conan.tools.files import copy, collect_libs +from conan.tools.files import copy from conan.tools.scm import Git from conan.errors import ConanInvalidConfiguration diff --git a/recipes/tun2socks/conanfile.py b/recipes/tun2socks/conanfile.py index 048f1c9d0..417bcfd10 100644 --- a/recipes/tun2socks/conanfile.py +++ b/recipes/tun2socks/conanfile.py @@ -65,7 +65,8 @@ class Tun2Socks(ConanFile): def generate(self): tc = AutotoolsToolchain(self) - env = Environment() + env = tc.environment() + env.define("LDFLAGS", "") env.define("CGO_LDFLAGS", tc.ldflags) env.define("CGO_CFLAGS", tc.cflags) env.define("GOOS", self._goos)