dan9i10/amnezia-client
1
0
Fork 0
mirror of https://github.com/amnezia-vpn/amnezia-client.git synced 2026-05-08 14:33:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore(conan): recipes cleanup

Browse Source
This commit is contained in:
Yaroslav Gurov
2026-03-27 00:22:09 +01:00
parent fa5076dff0
commit 98915b3cf2
6 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
recipes/amnezia-xray-bindings/conanfile.py
View File

@@ -1,10 +1,8 @@
# conanfile.py
from conan import ConanFile from conan import ConanFile
from conan.tools.files import get, copy, collect_libs, chdir, rename from conan.tools.files import get, copy, collect_libs, chdir, rename
from conan.tools.layout import basic_layout from conan.tools.layout import basic_layout
from conan.errors import ConanInvalidConfiguration from conan.errors import ConanInvalidConfiguration
from conan.tools.gnu import Autotools, AutotoolsToolchain from conan.tools.gnu import Autotools, AutotoolsToolchain
from conan.tools.env import Environment
import os import os
@@ -63,7 +61,7 @@ class AmneziaXrayBindings(ConanFile):
tc.make_args = [ tc.make_args = [
"LIB_ARC=libamnezia_xray.a" "LIB_ARC=libamnezia_xray.a"
] ]
env = Environment() env = tc.environment()
env.define("ARCH", self._goarch) env.define("ARCH", self._goarch)
env.define("GOARCH", self._goarch) env.define("GOARCH", self._goarch)
env.define("GOOS", self._goos) env.define("GOOS", self._goos)

2
recipes/awg-apple/conanfile.py
View File

@@ -1,7 +1,7 @@
from conan import ConanFile from conan import ConanFile
from conan.errors import ConanInvalidConfiguration from conan.errors import ConanInvalidConfiguration
from conan.tools.layout import basic_layout 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.apple import is_apple_os
from conan.tools.gnu import AutotoolsToolchain, Autotools from conan.tools.gnu import AutotoolsToolchain, Autotools

5
recipes/awg-go/conanfile.py
View File

@@ -3,7 +3,6 @@ from conan.errors import ConanInvalidConfiguration
from conan.tools.layout import basic_layout from conan.tools.layout import basic_layout
from conan.tools.files import get, copy from conan.tools.files import get, copy
from conan.tools.gnu import Autotools, AutotoolsToolchain from conan.tools.gnu import Autotools, AutotoolsToolchain
from conan.tools.env import Environment
import os import os
@@ -48,9 +47,11 @@ class AwgGo(ConanFile):
def generate(self): def generate(self):
tc = AutotoolsToolchain(self) tc = AutotoolsToolchain(self)
env = Environment() env = tc.environment()
env.define("GOOS", self._goos) env.define("GOOS", self._goos)
env.define("GOARCH", self._goarch) env.define("GOARCH", self._goarch)
env.define("CGO_LDFLAGS", tc.ldflags)
env.define("CGO_CFLAGS", tc.cflags)
tc.generate(env) tc.generate(env)
def build(self): def build(self):

2
recipes/awg-windows/conanfile.py
View File

@@ -1,7 +1,7 @@
from conan import ConanFile from conan import ConanFile
from conan.tools.layout import basic_layout from conan.tools.layout import basic_layout
from conan.errors import ConanInvalidConfiguration 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 from conan.tools.gnu import AutotoolsToolchain
import os import os

2
recipes/openvpn-pt-android/conanfile.py
View File

@@ -1,6 +1,6 @@
from conan import ConanFile from conan import ConanFile
from conan.tools.cmake import cmake_layout, CMake, CMakeToolchain 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.tools.scm import Git
from conan.errors import ConanInvalidConfiguration from conan.errors import ConanInvalidConfiguration

3
recipes/tun2socks/conanfile.py
View File

@@ -65,7 +65,8 @@ class Tun2Socks(ConanFile):
def generate(self): def generate(self):
tc = AutotoolsToolchain(self) tc = AutotoolsToolchain(self)
env = Environment() env = tc.environment()
env.define("LDFLAGS", "")
env.define("CGO_LDFLAGS", tc.ldflags) env.define("CGO_LDFLAGS", tc.ldflags)
env.define("CGO_CFLAGS", tc.cflags) env.define("CGO_CFLAGS", tc.cflags)
env.define("GOOS", self._goos) env.define("GOOS", self._goos)