From b04e1c8da3acf1851d9d7fb14d024a101c8b673d Mon Sep 17 00:00:00 2001 From: Anonymous Maarten Date: Wed, 8 Sep 2021 18:42:52 +0200 Subject: [PATCH 01/10] nspr: bump + modernize + no tools.os_info in `build_requirements` --- recipes/nspr/all/conandata.yml | 15 +++--- recipes/nspr/all/conanfile.py | 52 ++++++++++++------- recipes/nspr/all/test_package/CMakeLists.txt | 12 ++--- recipes/nspr/all/test_package/conanfile.py | 2 +- recipes/nspr/all/test_package/test_package.c | 28 ++++++++++ .../nspr/all/test_package/test_package.cpp | 30 ----------- recipes/nspr/config.yml | 8 +-- 7 files changed, 81 insertions(+), 66 deletions(-) create mode 100644 recipes/nspr/all/test_package/test_package.c delete mode 100644 recipes/nspr/all/test_package/test_package.cpp diff --git a/recipes/nspr/all/conandata.yml b/recipes/nspr/all/conandata.yml index 25d69722138d7..68be82177af82 100644 --- a/recipes/nspr/all/conandata.yml +++ b/recipes/nspr/all/conandata.yml @@ -1,13 +1,16 @@ sources: - "4.24": - sha256: 90a59a0df6a11528749647fe18401cc7e03881e3e63c309f8c520ce06dd413d0 - url: https://ftp.mozilla.org/pub/nspr/releases/v4.24/src/nspr-4.24.tar.gz - "4.27": - sha256: 6d495192b6ab00a3c28db053492cf794329f7c0351a5728db198111a1816e89b - url: https://ftp.mozilla.org/pub/nspr/releases/v4.27/src/nspr-4.27.tar.gz + "4.32": + url: "https://ftp.mozilla.org/pub/nspr/releases/v4.32/src/nspr-4.32.tar.gz" + sha256: "bb6bf4f534b9559cf123dcdc6f9cd8167de950314a90a88b2a329c16836e7f6c" "4.29": sha256: 22286bdb8059d74632cc7c2865c139e63953ecfb33bf4362ab58827e86e92582 url: https://ftp.mozilla.org/pub/nspr/releases/v4.29/src/nspr-4.29.tar.gz "4.32": sha256: bb6bf4f534b9559cf123dcdc6f9cd8167de950314a90a88b2a329c16836e7f6c url: https://ftp.mozilla.org/pub/nspr/releases/v4.32/src/nspr-4.32.tar.gz + "4.27": + url: "https://ftp.mozilla.org/pub/nspr/releases/v4.27/src/nspr-4.27.tar.gz" + sha256: "6d495192b6ab00a3c28db053492cf794329f7c0351a5728db198111a1816e89b" + "4.24": + url: "https://ftp.mozilla.org/pub/nspr/releases/v4.24/src/nspr-4.24.tar.gz" + sha256: "90a59a0df6a11528749647fe18401cc7e03881e3e63c309f8c520ce06dd413d0" diff --git a/recipes/nspr/all/conanfile.py b/recipes/nspr/all/conanfile.py index 2efd360870ba0..22c779adc6239 100644 --- a/recipes/nspr/all/conanfile.py +++ b/recipes/nspr/all/conanfile.py @@ -3,22 +3,24 @@ import conan.tools.files from contextlib import contextmanager import os +import contextlib +import os -required_conan_version = ">=1.33" +required_conan_version = ">=1.33.0" class NsprConan(ConanFile): name = "nspr" homepage = "https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSPR" description = "Netscape Portable Runtime (NSPR) provides a platform-neutral API for system level and libc-like functions." - topics = ("conan", "nspr", "libc") + topics = ("nspr", "libc") url = "https://github.com/conan-io/conan-center-index" - settings = "os", "compiler", "arch", "build_type" license = "MPL-2.0" + settings = "os", "arch", "compiler", "build_type" options = { "shared": [True, False], "fPIC": [True, False], "with_mozilla": [True, False], - "win32_target": ["winnt", "win95"] + "win32_target": ["winnt", "win95"], } default_options = { "shared": False, @@ -26,6 +28,7 @@ class NsprConan(ConanFile): "with_mozilla": True, "win32_target": "winnt", } + generators = "cmake" _autotools = None @@ -45,10 +48,10 @@ def config_options(self): del self.options.win32_target def configure(self): - del self.settings.compiler.cppstd - del self.settings.compiler.libcxx if self.options.shared: del self.options.fPIC + del self.settings.compiler.cppstd + del self.settings.compiler.libcxx def validate(self): # https://bugzilla.mozilla.org/show_bug.cgi?id=1658671 @@ -58,19 +61,20 @@ def validate(self): def source(self): tools.get(**self.conan_data["sources"][self.version], - strip_root=True) - conan.tools.files.rename(self, "nspr", self._source_subfolder) + destination="tmp", strip_root=True) + os.rename(os.path.join("tmp", "nspr"), self._source_subfolder) + tools.rmdir("tmp") def build_requirements(self): - if self._settings_build.os == "Windows" : + if self._settings_build.os == "Windows": self.build_requires("mozilla-build/3.3") if not tools.get_env("CONAN_BASH_PATH"): self.build_requires("msys2/cci.latest") - @contextmanager + @contextlib.contextmanager def _build_context(self): if self.settings.compiler == "Visual Studio": - with tools.vcvars(self.settings): + with tools.vcvars(self): with tools.environment_append({"CC": "cl", "CXX": "cl", "LD": "link"}): yield else: @@ -79,8 +83,14 @@ def _build_context(self): def _configure_autotools(self): if self._autotools: return self._autotools + self._autotools = AutoToolsBuildEnvironment(self, win_bash=tools.os_info.is_windows) + yes_no = lambda v: "yes" if v else "no" conf_args = [ - "--with-mozilla" if self.options.with_mozilla else "--without-mozilla", + "--with-mozilla={}".format(yes_no(self.options.with_mozilla)), + "--enable-64bit={}".format(yes_no(self.settings.arch == "x86_64")), + "--enable-strip={}".format(yes_no(self.settings.build_type not in ("Debug", "RelWithDebInfo"))), + "--enable-debug={}".format(yes_no(self.settings.build_type == "Debug")), + "--datarootdir={}".format(tools.unix_path(os.path.join(self.package_folder, "res"))), "--disable-cplus", "--enable-64bit" if self.settings.arch in ("armv8", "x86_64") else "--disable-64bit", "--disable-strip" if self.settings.build_type == "RelWithDebInfo" else "--enable-strip", @@ -89,20 +99,18 @@ def _configure_autotools(self): if self.settings.compiler == "Visual Studio": conf_args.extend([ "{}-pc-mingw32".format("x86_64" if self.settings.arch == "x86_64" else "x86"), - "--enable-static-rtl" if "MT" in str(self.settings.compiler.runtime) else "--disable-static-rtl", - "--enable-debug-rtl" if "d" in str(self.settings.compiler.runtime) else "--disable-debug-rtl", + "--enable-static-rtl={}".format(yes_no("MT" in self.settings.compiler.runtime)), + "--enable-debug-rtl={}".format(yes_no("d" in self.settings.compiler.runtime)), ]) elif self.settings.os == "Android": conf_args.extend([ - "--with-android-ndk={}".format(os.environ["NDK_ROOT"]), + "--with-android-ndk={}".format(tools.get_env(["NDK_ROOT"])), "--with-android-version={}".format(self.settings.os.api_level), - "--with-android-platform={}".format(os.environ["ANDROID_PLATFORM"]), - "--with-android-toolchain={}".format(os.environ["ANDROID_TOOLCHAIN"]), + "--with-android-platform={}".format(tools.get_env("ANDROID_PLATFORM")), + "--with-android-toolchain={}".format(tools.get_env("ANDROID_TOOLCHAIN")), ]) elif self.settings.os == "Windows": conf_args.append("--enable-win32-target={}".format(self.options.win32_target)) - self._autotools = AutoToolsBuildEnvironment(self, win_bash=tools.os_info.is_windows) - env = self._autotools.vars if self.settings.os == "Macos": if self.settings.arch == "armv8": @@ -184,3 +192,9 @@ def package_info(self): self.cpp_info.system_libs.extend(["dl", "pthread"]) elif self.settings.os == "Windows": self.cpp_info.system_libs.extend(["winmm", "ws2_32"]) + + aclocal = tools.unix_path(os.path.join(self.package_folder, "res", "aclocal")) + self.output.info("Appending AUTOMAKE_CONAN_INCLUDES environment variable: {}".format(aclocal)) + self.env_info.AUTOMAKE_CONAN_INCLUDES.append(aclocal) + + self.cpp_info.resdirs = ["res"] diff --git a/recipes/nspr/all/test_package/CMakeLists.txt b/recipes/nspr/all/test_package/CMakeLists.txt index 641059df6fa46..e8bb34d55a637 100644 --- a/recipes/nspr/all/test_package/CMakeLists.txt +++ b/recipes/nspr/all/test_package/CMakeLists.txt @@ -1,10 +1,10 @@ cmake_minimum_required(VERSION 3.1) -project(test_package) - -set(CMAKE_CXX_STANDARD 11) +project(test_package C) include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake) -conan_basic_setup() +conan_basic_setup(TARGETS) + +find_package(nspr REQUIRED CONFIG) -add_executable(${PROJECT_NAME} test_package.cpp) -target_link_libraries(${PROJECT_NAME} ${CONAN_LIBS}) +add_executable(${PROJECT_NAME} test_package.c) +target_link_libraries(${PROJECT_NAME} PRIVATE nspr::nspr) diff --git a/recipes/nspr/all/test_package/conanfile.py b/recipes/nspr/all/test_package/conanfile.py index d4128b0450777..49a3a66ea5bad 100644 --- a/recipes/nspr/all/test_package/conanfile.py +++ b/recipes/nspr/all/test_package/conanfile.py @@ -4,7 +4,7 @@ class TestPackageConan(ConanFile): settings = "os", "compiler", "build_type", "arch" - generators = "cmake" + generators = "cmake", "cmake_find_package_multi" def build(self): cmake = CMake(self) diff --git a/recipes/nspr/all/test_package/test_package.c b/recipes/nspr/all/test_package/test_package.c new file mode 100644 index 0000000000000..1deb5c1d9ce76 --- /dev/null +++ b/recipes/nspr/all/test_package/test_package.c @@ -0,0 +1,28 @@ +#include + +#include + +static int primordial(int argc, char *argv[]) { + if (PR_Initialized() != PR_TRUE) { + fprintf(stderr, "NSPR not initialized!\n"); + return 1; + } + fprintf(stderr, "Inside primordial function\n"); + return 0; +} + +int main(int argc, char *argv[]) { + int versionOk = PR_VersionCheck(PR_VERSION); + if (versionOk == 0) { + fprintf(stderr, "PR_VersionCheck() failed\n"); + return 1; + } + printf(PR_NAME " version %s\n", PR_GetVersion()); + PR_Initialize(primordial, argc, argv, 0); + + PR_Cleanup(); + + PR_ProcessExit(0); + fprintf(stderr, "PR_ProcessExit faile\n"); + return 1; +} diff --git a/recipes/nspr/all/test_package/test_package.cpp b/recipes/nspr/all/test_package/test_package.cpp deleted file mode 100644 index 51c836dec9422..0000000000000 --- a/recipes/nspr/all/test_package/test_package.cpp +++ /dev/null @@ -1,30 +0,0 @@ -#include - -#include - - -static int primordial(int argc, char *argv[]) { - if (PR_Initialized() != PR_TRUE) { - std::cerr << "NSPR not initialized!\n"; - return 1; - } - std::cout << "Inside primordial function\n"; - return 0; -} - - -int main(int argc, char *argv[]) { - bool versionOk = PR_VersionCheck(PR_VERSION); - if (!versionOk) { - std::cerr << "PR_VersionCheck() failed\n"; - return 1; - } - std::cout << PR_NAME << " version " << PR_GetVersion() << "\n"; - return PR_Initialize(primordial, argc, argv, 0); - - PR_Cleanup(); - - PR_ProcessExit(0); - std::cerr << "PR_ProcessExit faile\n"; - return 1; -} diff --git a/recipes/nspr/config.yml b/recipes/nspr/config.yml index 1a2287e6d5e4a..1227858a5232b 100644 --- a/recipes/nspr/config.yml +++ b/recipes/nspr/config.yml @@ -1,9 +1,9 @@ versions: - "4.24": - folder: all - "4.27": + "4.32": folder: all "4.29": folder: all - "4.32": + "4.27": + folder: all + "4.24": folder: all From 57db0cd2f21eb36f1da0cd68137f76bb0f92a783 Mon Sep 17 00:00:00 2001 From: Anonymous Maarten Date: Wed, 8 Sep 2021 22:29:59 +0200 Subject: [PATCH 02/10] nspr: add more 64-bit cpus --- recipes/nspr/all/conanfile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/nspr/all/conanfile.py b/recipes/nspr/all/conanfile.py index 22c779adc6239..cd0bedcf0b3cf 100644 --- a/recipes/nspr/all/conanfile.py +++ b/recipes/nspr/all/conanfile.py @@ -87,7 +87,7 @@ def _configure_autotools(self): yes_no = lambda v: "yes" if v else "no" conf_args = [ "--with-mozilla={}".format(yes_no(self.options.with_mozilla)), - "--enable-64bit={}".format(yes_no(self.settings.arch == "x86_64")), + "--enable-64bit={}".format(yes_no(self.settings.arch in ("armv8", "x86_64", "mips64", "ppc64", "ppc64le"))), "--enable-strip={}".format(yes_no(self.settings.build_type not in ("Debug", "RelWithDebInfo"))), "--enable-debug={}".format(yes_no(self.settings.build_type == "Debug")), "--datarootdir={}".format(tools.unix_path(os.path.join(self.package_folder, "res"))), From 3265175e5c6dd9b77f7861d0d2451b160106a000 Mon Sep 17 00:00:00 2001 From: Anonymous Maarten Date: Wed, 8 Sep 2021 22:30:37 +0200 Subject: [PATCH 03/10] nspr: DEBUG print config.log --- recipes/nspr/all/conanfile.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/recipes/nspr/all/conanfile.py b/recipes/nspr/all/conanfile.py index cd0bedcf0b3cf..2488c4c9b1372 100644 --- a/recipes/nspr/all/conanfile.py +++ b/recipes/nspr/all/conanfile.py @@ -124,8 +124,13 @@ def _configure_autotools(self): def build(self): with tools.chdir(self._source_subfolder): with self._build_context(): - autotools = self._configure_autotools() - autotools.make() + try: + autotools = self._configure_autotools() + autotools.make() + except: + # FIXME: DEBUG + print(tools.load("config.log")) + raise def package(self): self.copy(pattern="LICENSE", dst="licenses", src=self._source_subfolder) From d25fdb19d253e17d997bc77b2c84f87e7efb7e98 Mon Sep 17 00:00:00 2001 From: Anonymous Maarten Date: Thu, 9 Sep 2021 00:27:22 +0200 Subject: [PATCH 04/10] Revert "nspr: DEBUG print config.log" This reverts commit 3a9dd3e9e9e8e1917faa08916b5ca3cd9b96acc7. --- recipes/nspr/all/conanfile.py | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/recipes/nspr/all/conanfile.py b/recipes/nspr/all/conanfile.py index 2488c4c9b1372..cd0bedcf0b3cf 100644 --- a/recipes/nspr/all/conanfile.py +++ b/recipes/nspr/all/conanfile.py @@ -124,13 +124,8 @@ def _configure_autotools(self): def build(self): with tools.chdir(self._source_subfolder): with self._build_context(): - try: - autotools = self._configure_autotools() - autotools.make() - except: - # FIXME: DEBUG - print(tools.load("config.log")) - raise + autotools = self._configure_autotools() + autotools.make() def package(self): self.copy(pattern="LICENSE", dst="licenses", src=self._source_subfolder) From 0a8b084520f3e34ee46e4f3b6be084c682beed92 Mon Sep 17 00:00:00 2001 From: SSE4 Date: Tue, 22 Feb 2022 21:09:06 -0800 Subject: [PATCH 05/10] Update recipes/nspr/all/conanfile.py --- recipes/nspr/all/conanfile.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes/nspr/all/conanfile.py b/recipes/nspr/all/conanfile.py index cd0bedcf0b3cf..b6f65f5951b12 100644 --- a/recipes/nspr/all/conanfile.py +++ b/recipes/nspr/all/conanfile.py @@ -99,8 +99,8 @@ def _configure_autotools(self): if self.settings.compiler == "Visual Studio": conf_args.extend([ "{}-pc-mingw32".format("x86_64" if self.settings.arch == "x86_64" else "x86"), - "--enable-static-rtl={}".format(yes_no("MT" in self.settings.compiler.runtime)), - "--enable-debug-rtl={}".format(yes_no("d" in self.settings.compiler.runtime)), + "--enable-static-rtl" if "MT" in str(self.settings.compiler.runtime) else "--disable-static-rtl", + "--enable-debug-rtl" if "d" in str(self.settings.compiler.runtime) else "--disable-debug-rtl", ]) elif self.settings.os == "Android": conf_args.extend([ From fa4eeefcca70d48e9b871065d240cda8f113d922 Mon Sep 17 00:00:00 2001 From: SSE4 Date: Fri, 4 Mar 2022 22:55:09 +0700 Subject: [PATCH 06/10] - PR_Initialize implicitly calls PR_Cleanup on exiting the primordial function (https://www-archive.mozilla.org/projects/nspr/reference/html/prinit.html#15758) Signed-off-by: SSE4 --- recipes/nspr/all/test_package/test_package.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/recipes/nspr/all/test_package/test_package.c b/recipes/nspr/all/test_package/test_package.c index 1deb5c1d9ce76..b5290fe34357e 100644 --- a/recipes/nspr/all/test_package/test_package.c +++ b/recipes/nspr/all/test_package/test_package.c @@ -20,8 +20,6 @@ int main(int argc, char *argv[]) { printf(PR_NAME " version %s\n", PR_GetVersion()); PR_Initialize(primordial, argc, argv, 0); - PR_Cleanup(); - PR_ProcessExit(0); fprintf(stderr, "PR_ProcessExit faile\n"); return 1; From 7d8fc291be533f3c6119e0dda3ad3cf167e4c381 Mon Sep 17 00:00:00 2001 From: SSE4 Date: Fri, 4 Mar 2022 22:55:22 +0700 Subject: [PATCH 07/10] - typo Signed-off-by: SSE4 --- recipes/nspr/all/test_package/test_package.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/nspr/all/test_package/test_package.c b/recipes/nspr/all/test_package/test_package.c index b5290fe34357e..820afa6a51abe 100644 --- a/recipes/nspr/all/test_package/test_package.c +++ b/recipes/nspr/all/test_package/test_package.c @@ -21,6 +21,6 @@ int main(int argc, char *argv[]) { PR_Initialize(primordial, argc, argv, 0); PR_ProcessExit(0); - fprintf(stderr, "PR_ProcessExit faile\n"); + fprintf(stderr, "PR_ProcessExit failed\n"); return 1; } From 1ec6211b130b8cfe913031322401de8f9edefd12 Mon Sep 17 00:00:00 2001 From: SSE4 Date: Fri, 4 Mar 2022 22:55:59 +0700 Subject: [PATCH 08/10] - support msvc compiler Signed-off-by: SSE4 --- recipes/nspr/all/conanfile.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/recipes/nspr/all/conanfile.py b/recipes/nspr/all/conanfile.py index b6f65f5951b12..33f6882499f6e 100644 --- a/recipes/nspr/all/conanfile.py +++ b/recipes/nspr/all/conanfile.py @@ -33,6 +33,10 @@ class NsprConan(ConanFile): _autotools = None + @property + def _is_msvc(self): + return self.settings.compiler in ["Visual Studio", "msvc"] + @property def _source_subfolder(self): return "source_subfolder" @@ -73,7 +77,7 @@ def build_requirements(self): @contextlib.contextmanager def _build_context(self): - if self.settings.compiler == "Visual Studio": + if self._is_msvc: with tools.vcvars(self): with tools.environment_append({"CC": "cl", "CXX": "cl", "LD": "link"}): yield @@ -96,7 +100,7 @@ def _configure_autotools(self): "--disable-strip" if self.settings.build_type == "RelWithDebInfo" else "--enable-strip", "--enable-debug" if self.settings.build_type == "Debug" else "--disable-debug", ] - if self.settings.compiler == "Visual Studio": + if self._is_msvc: conf_args.extend([ "{}-pc-mingw32".format("x86_64" if self.settings.arch == "x86_64" else "x86"), "--enable-static-rtl" if "MT" in str(self.settings.compiler.runtime) else "--disable-static-rtl", @@ -140,8 +144,8 @@ def package(self): if self.options.shared: os.mkdir(os.path.join(self.package_folder, "bin")) for lib in self._library_names: - libsuffix = "lib" if self.settings.compiler == "Visual Studio" else "a" - libprefix = "" if self.settings.compiler == "Visual Studio" else "lib" + libsuffix = "lib" if self._is_msvc else "a" + libprefix = "" if self._is_msvc else "lib" if self.options.shared: os.unlink(os.path.join(self.package_folder, "lib", "{}{}_s.{}".format(libprefix, lib, libsuffix))) os.rename(os.path.join(self.package_folder, "lib", "{}.dll".format(lib)), From 1da5e4d7e046d95cc62561a38c2e6ebde5c6f375 Mon Sep 17 00:00:00 2001 From: SSE4 Date: Fri, 4 Mar 2022 22:56:20 +0700 Subject: [PATCH 09/10] Revert "Update recipes/nspr/all/conanfile.py" This reverts commit 0a8b084520f3e34ee46e4f3b6be084c682beed92. --- recipes/nspr/all/conanfile.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes/nspr/all/conanfile.py b/recipes/nspr/all/conanfile.py index 33f6882499f6e..841dca56add35 100644 --- a/recipes/nspr/all/conanfile.py +++ b/recipes/nspr/all/conanfile.py @@ -103,8 +103,8 @@ def _configure_autotools(self): if self._is_msvc: conf_args.extend([ "{}-pc-mingw32".format("x86_64" if self.settings.arch == "x86_64" else "x86"), - "--enable-static-rtl" if "MT" in str(self.settings.compiler.runtime) else "--disable-static-rtl", - "--enable-debug-rtl" if "d" in str(self.settings.compiler.runtime) else "--disable-debug-rtl", + "--enable-static-rtl={}".format(yes_no("MT" in self.settings.compiler.runtime)), + "--enable-debug-rtl={}".format(yes_no("d" in self.settings.compiler.runtime)), ]) elif self.settings.os == "Android": conf_args.extend([ From a048ad62a06dd9c8bdfecb1e886b8068ca9ee9fd Mon Sep 17 00:00:00 2001 From: SSE4 Date: Fri, 4 Mar 2022 22:59:45 +0700 Subject: [PATCH 10/10] - linter Signed-off-by: SSE4 --- recipes/nspr/all/conandata.yml | 3 --- recipes/nspr/all/conanfile.py | 3 --- 2 files changed, 6 deletions(-) diff --git a/recipes/nspr/all/conandata.yml b/recipes/nspr/all/conandata.yml index 68be82177af82..a3b285a093794 100644 --- a/recipes/nspr/all/conandata.yml +++ b/recipes/nspr/all/conandata.yml @@ -1,7 +1,4 @@ sources: - "4.32": - url: "https://ftp.mozilla.org/pub/nspr/releases/v4.32/src/nspr-4.32.tar.gz" - sha256: "bb6bf4f534b9559cf123dcdc6f9cd8167de950314a90a88b2a329c16836e7f6c" "4.29": sha256: 22286bdb8059d74632cc7c2865c139e63953ecfb33bf4362ab58827e86e92582 url: https://ftp.mozilla.org/pub/nspr/releases/v4.29/src/nspr-4.29.tar.gz diff --git a/recipes/nspr/all/conanfile.py b/recipes/nspr/all/conanfile.py index 841dca56add35..f6be3f290a40c 100644 --- a/recipes/nspr/all/conanfile.py +++ b/recipes/nspr/all/conanfile.py @@ -1,10 +1,7 @@ from conans import ConanFile, tools, AutoToolsBuildEnvironment from conans.errors import ConanInvalidConfiguration -import conan.tools.files -from contextlib import contextmanager import os import contextlib -import os required_conan_version = ">=1.33.0"