Skip to content

Commit

Permalink
nas: use newer user conf from xorg-cf-files dependency
Browse files Browse the repository at this point in the history
  • Loading branch information
jcar87 committed Mar 14, 2023
1 parent d695aea commit a82242b
Showing 1 changed file with 6 additions and 2 deletions.
8 changes: 6 additions & 2 deletions recipes/nas/all/conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

from conan.errors import ConanInvalidConfiguration
from conan.tools.layout import basic_layout
from conan.tools.env import VirtualBuildEnv
from conan.tools.files import chdir, get, download, export_conandata_patches, apply_conandata_patches, rm, copy
from conan.tools.gnu import AutotoolsToolchain, Autotools, AutotoolsDeps
import os
Expand Down Expand Up @@ -70,9 +71,12 @@ def generate(self):
deps = AutotoolsDeps(self)
deps.generate()

buildenv = VirtualBuildEnv(self)
buildenv.generate()

@property
def _imake_irulesrc(self):
return self._user_info_build["xorg-cf-files"].CONFIG_PATH
return self.conf.get("user.xorg-cf-files:config-path")

@property
def _imake_defines(self):
Expand All @@ -86,7 +90,7 @@ def build(self):
apply_conandata_patches(self)

with chdir(self, self.source_folder):
self.run("imake -DUseInstalled -I{} {}".format(self._imake_irulesrc, self._imake_defines), run_environment=True)
self.run("imake -DUseInstalled -I{} {}".format(self._imake_irulesrc, self._imake_defines), env="conanbuild")
autotools = Autotools(self)
# j1 avoids some errors while trying to run this target
autotools.make(target="World", args=["-j1"] + self._imake_make_args)
Expand Down

0 comments on commit a82242b

Please sign in to comment.