Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

onetbb: 2020.x - pass cppstd to make #13552

Merged
merged 3 commits into from
Nov 29, 2022
+42 −32
Merged

onetbb: 2020.x - pass cppstd to make #13552

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
791784e
onetbb: 2020.x - pass cppstd to make
Nekto89 Oct 17, 2022
5822f1f
update tools
uilianries Nov 23, 2022
e716474
Merge pull request #2 from uilianries/onetbb/2020_3_stdver
Nekto89 Nov 23, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
74 changes: 42 additions & 32 deletions recipes/onetbb/2020.x/conanfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,14 @@
from conan.tools.microsoft import msvc_runtime_flag
from conans import ConanFile, tools
from conans.errors import ConanInvalidConfiguration, ConanException
from conan import ConanFile
from conan.tools.microsoft import msvc_runtime_flag, is_msvc
from conan.tools.build import cross_building
from conan.tools.files import get, replace_in_file, save, chdir, copy
from conan.tools.scm import Version
from conan.errors import ConanInvalidConfiguration, ConanException
from conans import tools
import os
import textwrap

required_conan_version = ">=1.43.0"
required_conan_version = ">=1.47.0"


class OneTBBConan(ConanFile):
Expand Down Expand Up @@ -41,10 +45,6 @@ def _source_subfolder(self):
def _settings_build(self):
return getattr(self, "settings_build", self.settings)

@property
def _is_msvc(self):
return str(self.settings.compiler) in ["Visual Studio", "msvc"]

@property
def _is_clanglc(self):
return self.settings.os == "Windows" and self.settings.compiler == "clang"
Expand All @@ -66,10 +66,10 @@ def configure(self):

def validate(self):
if self.settings.os == "Macos":
if hasattr(self, "settings_build") and tools.cross_building(self):
if hasattr(self, "settings_build") and cross_building(self):
# See logs from https://github.com/conan-io/conan-center-index/pull/8454
raise ConanInvalidConfiguration("Cross building on Macos is not yet supported. Contributions are welcome")
if self.settings.compiler == "apple-clang" and tools.Version(self.settings.compiler.version) < "8.0":
if self.settings.compiler == "apple-clang" and Version(self.settings.compiler.version) < "8.0":
raise ConanInvalidConfiguration("%s %s couldn't be built by apple-clang < 8.0" % (self.name, self.version))
if not self.options.shared:
self.output.warn("oneTBB strongly discourages usage of static linkage")
Expand All @@ -88,7 +88,7 @@ def build_requirements(self):
self.build_requires("make/4.2.1")

def source(self):
tools.get(**self.conan_data["sources"][self.version],
get(self, **self.conan_data["sources"][self.version],
strip_root=True, destination=self._source_subfolder)

def build(self):
Expand All @@ -100,14 +100,14 @@ def add_flag(name, value):

# Get the version of the current compiler instead of gcc
linux_include = os.path.join(self._source_subfolder, "build", "linux.inc")
tools.replace_in_file(linux_include, "shell gcc", "shell $(CC)")
tools.replace_in_file(linux_include, "= gcc", "= $(CC)")
replace_in_file(self, linux_include, "shell gcc", "shell $(CC)")
replace_in_file(self, linux_include, "= gcc", "= $(CC)")

if self.version != "2019_u9" and self.settings.build_type == "Debug":
tools.replace_in_file(os.path.join(self._source_subfolder, "Makefile"), "release", "debug")
replace_in_file(self, os.path.join(self._source_subfolder, "Makefile"), "release", "debug")

if str(self._base_compiler) in ["Visual Studio", "msvc"]:
tools.save(
save(self,
os.path.join(self._source_subfolder, "build", "big_iron_msvc.inc"),
# copy of big_iron.inc adapted for MSVC
textwrap.dedent("""\
Expand Down Expand Up @@ -195,12 +195,23 @@ def add_flag(name, value):
extra += " compiler=icl"
else:
extra += " compiler=cl"
cxx_std_flag = tools.cppstd_flag(self.settings)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This tool is not ported to new tools, which means, it will be deprecated soon if not ported.

if cxx_std_flag:
cxx_std_value = (
cxx_std_flag.split("=")[1]
if "=" in cxx_std_flag
else cxx_std_flag.split(":")[1]
if ":" in cxx_std_flag
else None
)
if cxx_std_value:
extra += f" stdver={cxx_std_value}"

make = tools.get_env("CONAN_MAKE_PROGRAM", tools.which("make") or tools.which("mingw32-make"))
if not make:
raise ConanException("This package needs 'make' in the path to build")

with tools.chdir(self._source_subfolder):
with chdir(self, self._source_subfolder):
# intentionally not using AutoToolsBuildEnvironment for now - it's broken for clang-cl
if self._is_clanglc:
add_flag("CFLAGS", "-mrtm")
Expand All @@ -210,36 +221,35 @@ def add_flag(name, value):
context = tools.no_op()
if self.settings.compiler == "intel":
context = tools.intel_compilervars(self)
elif self._is_msvc:
elif is_msvc(self):
# intentionally not using vcvars for clang-cl yet
context = tools.vcvars(self)
with context:
self.run("%s %s %s" % (make, extra, " ".join(targets)))

def package(self):
self.copy("LICENSE", dst="licenses", src=self._source_subfolder)
self.copy(pattern="*.h", dst="include", src="%s/include" % self._source_subfolder)
self.copy(pattern="*", dst="include/tbb/compat", src="%s/include/tbb/compat" % self._source_subfolder)
build_folder = "%s/build/" % self._source_subfolder
copy(self, "LICENSE", dst=os.path.join(self.package_folder, "licenses"), src=self._source_subfolder)
copy(self, pattern="*.h", dst=os.path.join(self.package_folder, "include"), src=os.path.join(self._source_subfolder, "include"))
copy(self, pattern="*", dst=os.path.join(self.package_folder, "include", "tbb", "compat"), src=os.path.join(self._source_subfolder, "include", "tbb", "compat"))
build_folder = os.path.join(self._source_subfolder, "build")
build_type = "debug" if self.settings.build_type == "Debug" else "release"
self.copy(pattern="*%s*.lib" % build_type, dst="lib", src=build_folder, keep_path=False)
self.copy(pattern="*%s*.a" % build_type, dst="lib", src=build_folder, keep_path=False)
self.copy(pattern="*%s*.dll" % build_type, dst="bin", src=build_folder, keep_path=False)
self.copy(pattern="*%s*.dylib" % build_type, dst="lib", src=build_folder, keep_path=False)
copy(self, pattern=f"*{build_type}*.lib", dst=os.path.join(self.package_folder, "lib"), src=build_folder, keep_path=False)
copy(self, pattern=f"*{build_type}*.a", dst=os.path.join(self.package_folder, "lib"), src=build_folder, keep_path=False)
copy(self, pattern=f"*{build_type}*.dll", dst=os.path.join(self.package_folder, "bin"), src=build_folder, keep_path=False)
copy(self, pattern=f"*{build_type}*.dylib", dst=os.path.join(self.package_folder, "lib"), src=build_folder, keep_path=False)
# Copy also .dlls to lib folder so consumers can link against them directly when using MinGW
if self.settings.os == "Windows" and self.settings.compiler == "gcc":
self.copy("*%s*.dll" % build_type, dst="lib", src=build_folder, keep_path=False)
copy(self, f"*{build_type}*.dll", dst=os.path.join(self.package_folder, "lib"), src=build_folder, keep_path=False)

if self.settings.os == "Linux":
extension = "so"
if self.options.shared:
self.copy("*%s*.%s.*" % (build_type, extension), "lib", build_folder,
keep_path=False)
copy(self, f"*{build_type}*.{extension}.*", dst=os.path.join(self.package_folder, "lib"), src=build_folder, keep_path=False)
outputlibdir = os.path.join(self.package_folder, "lib")
os.chdir(outputlibdir)
for fpath in os.listdir(outputlibdir):
self.run("ln -s \"%s\" \"%s\"" %
(fpath, fpath[0:fpath.rfind("." + extension) + len(extension) + 1]))
with chdir(self, outputlibdir):
for fpath in os.listdir(outputlibdir):
filepath = fpath[0:fpath.rfind("." + extension) + len(extension) + 1]
self.run(f'ln -s "{fpath}" "{filepath}"', run_environment=True)

def package_info(self):
self.cpp_info.set_property("cmake_file_name", "TBB")
Expand Down