Merge branch 'master' of github.com:conan-io/conan-center-index into …

…develop

docs/error_knowledge_base.md

@@ -482,6 +482,16 @@ The legacy content in test_package should not be removed. Instead, rename that f
 
 The [self.requires()](https://docs.conan.io/en/latest/reference/conanfile/methods.html#requirements) allows to override a dependency version, forcing to use that version imposed by the recipe only. As a side-effect, dependencies can use different versions of the same project at the same package, which may cause unpredicted errors, like ABI incompatibility. For that reason, the `override` parameter is forbidden and should not be used. Instead, all dependencies should align their package versions, even when it's necessary to open more pull requests to update dependency versions.
 
+#### **<a name="KB-H076">#KB-H076</a>: "EITHER STATIC OR SHARED OF EACH LIB"**
+
+It checks whether static & shared artifacts of the same lib are packaged together. Also, if there are tuples of (.a/.dylib) or (.a/.so) files with the same name.
+So it works on Unix systems only, not Windows. Putting both same library name as shared and static in the very same package is considered an error, as it should be separated
+and managed by the package option `shared`.
+
+#### **<a name="KB-H077">#KB-H077</a>: "APPLE RELOCATABLE SHARED LIBS"**
+
+It checks whether installed shared libs are relocatable on Linux & macOS. All shared libs on macOS properly have `@rpath/<shared>` in install tree (@rpath token is supported since macOS 10.5 Leopard).
+
 ## Deprecated errors
 
 The following errors from the hooks are deprecated and no longer reported:

docs/supported_platforms_and_configurations.md

@@ -78,7 +78,7 @@ For more information see [conan-io/conan-docker-tools](https://github.com/conan-
 - CMake: 3.20.1
 - Compilers: Apple-clang versions 11.0.3, 12.0.5, 13.0.0
 - Macos SDK versions (for each apple-clang version respectively): 10.15, 11.3
-- Macos deployment target (`minos`): 11.3
+- Macos deployment target (`minos`): 11.0
 - C++ Standard Library (`libcxx`): `libc++`
 - Architectures: x86_64, armv8
 - Build types: Release, Debug

recipes/arrow/all/conanfile.py

@@ -477,7 +477,7 @@ def generate(self):
         tc.variables["AWSSDK_SOURCE"] = "SYSTEM"
         tc.variables["ARROW_BUILD_UTILITIES"] = bool(self.options.cli)
         tc.variables["ARROW_BUILD_INTEGRATION"] = False
-        tc.variables["ARROW_INSTALL_NAME_RPATH"] = False
+        tc.variables["ARROW_INSTALL_NAME_RPATH"] = True
         tc.variables["ARROW_BUILD_EXAMPLES"] = False
         tc.variables["ARROW_BUILD_TESTS"] = False
         tc.variables["ARROW_ENABLE_TIMING_TESTS"] = False
@@ -570,7 +570,7 @@ def package_info(self):
             self.cpp_info.components["libparquet"].names["pkg_config"] = "parquet"
             self.cpp_info.components["libparquet"].requires = ["libarrow"]
             if not self.options.shared:
-                self.cpp_info.components["libparquet"].defines = ["PARQUET_STATIC"]            
+                self.cpp_info.components["libparquet"].defines = ["PARQUET_STATIC"]
 
         if self.options.get_safe("substrait", False):
             self.cpp_info.components["libarrow_substrait"].libs = [self._lib_name("arrow_substrait")]
@@ -593,7 +593,7 @@ def package_info(self):
             self.cpp_info.components["libgandiva"].names["pkg_config"] = "gandiva"
             self.cpp_info.components["libgandiva"].requires = ["libarrow"]
             if not self.options.shared:
-                self.cpp_info.components["libgandiva"].defines = ["GANDIVA_STATIC"]            
+                self.cpp_info.components["libgandiva"].defines = ["GANDIVA_STATIC"]
 
         if self._with_flight_rpc():
             self.cpp_info.components["libarrow_flight"].libs = [self._lib_name("arrow_flight")]

recipes/autoconf/all/conanfile.py

@@ -11,6 +11,7 @@
 
 class AutoconfConan(ConanFile):
     name = "autoconf"
+    package_type = "application"
     description = (
         "Autoconf is an extensible package of M4 macros that produce shell "
         "scripts to automatically configure software source code packages"

recipes/automake/all/conandata.yml

@@ -11,27 +11,44 @@ sources:
   "1.16.2":
     url: "https://ftp.gnu.org/gnu/automake/automake-1.16.2.tar.gz"
     sha256: "b2f361094b410b4acbf4efba7337bdb786335ca09eb2518635a09fb7319ca5c1"
-  "1.16.1":
-    url: "https://ftp.gnu.org/gnu/automake/automake-1.16.1.tar.gz"
-    sha256: "608a97523f97db32f1f5d5615c98ca69326ced2054c9f82e65bade7fc4c9dea8"
 patches:
   "1.16.5":
     - patch_file: "patches/0001-help2man-no-discard-stderr-1.16.5.patch"
+      patch_description: "help2man no discard stderr"
+      patch_type: "portability"
     - patch_file: "patches/0002-no-perl-path-in-shebang-1.16.5.patch"
+      patch_description: "no perl path in shebang"
+      patch_type: "portability"
     - patch_file: "patches/0003-relocatable-automake-1.16.5.patch"
+      patch_description: "relocatable automake"
+      patch_type: "portability"
   "1.16.4":
     - patch_file: "patches/0001-help2man-no-discard-stderr-1.16.4.patch"
+      patch_description: "help2man no discard stderr"
+      patch_type: "portability"
     - patch_file: "patches/0002-no-perl-path-in-shebang-1.16.4.patch"
+      patch_description: "no perl path in shebang"
+      patch_type: "portability"
     - patch_file: "patches/0003-relocatable-automake-1.16.4.patch"
+      patch_description: "relocatable automake"
+      patch_type: "portability"
   "1.16.3":
     - patch_file: "patches/0001-help2man-no-discard-stderr-1.16.3.patch"
+      patch_description: "help2man no discard stderr"
+      patch_type: "portability"
     - patch_file: "patches/0002-no-perl-path-in-shebang-1.16.3.patch"
+      patch_description: "no perl path in shebang"
+      patch_type: "portability"
     - patch_file: "patches/0003-relocatable-automake-1.16.3.patch"
+      patch_description: "relocatable automake"
+      patch_type: "portability"
   "1.16.2":
     - patch_file: "patches/0001-help2man-no-discard-stderr-1.16.2.patch"
+      patch_description: "help2man no discard stderr"
+      patch_type: "portability"
     - patch_file: "patches/0002-no-perl-path-in-shebang-1.16.2.patch"
+      patch_description: "no perl path in shebang"
+      patch_type: "portability"
     - patch_file: "patches/0003-relocatable-automake-1.16.2.patch"
-  "1.16.1":
-    - patch_file: "patches/0001-help2man-no-discard-stderr-1.16.1.patch"
-    - patch_file: "patches/0002-no-perl-path-in-shebang-1.16.1.patch"
-    - patch_file: "patches/0003-relocatable-automake-1.16.1.patch"
+      patch_description: "relocatable automake"
+      patch_type: "portability"

recipes/automake/all/test_package/conanfile.py

@@ -6,7 +6,7 @@
 from conan.tools.files import chdir
 from conan.tools.gnu import Autotools, AutotoolsToolchain
 from conan.tools.layout import basic_layout
-from conan.tools.microsoft import is_msvc, unix_path
+from conan.tools.microsoft import unix_path
 
 
 required_conan_version = ">=1.53.0"

recipes/automake/config.yml

@@ -7,5 +7,3 @@ versions:
     folder: all
   "1.16.2":
     folder: all
-  "1.16.1":
-    folder: all

recipes/catch2/3.x.x/conandata.yml

@@ -1,4 +1,7 @@
 sources:
+  "3.3.0":
+    url: "https://github.com/catchorg/Catch2/archive/v3.3.0.tar.gz"
+    sha256: "fe2f29a54ca775c2dd04bb97ffb79d398e6210e3caa174348b5cd3b7e4ca887d"
   "3.2.1":
     url: "https://github.com/catchorg/Catch2/archive/v3.2.1.tar.gz"
     sha256: "4613d3e8142b672159fcae252a4860d72c8cf8e2df5043b1ae3541db9ef5d73c"

recipes/catch2/config.yml

@@ -1,4 +1,6 @@
 versions:
+  "3.3.0":
+    folder: 3.x.x
   "3.2.1":
     folder: 3.x.x
   "3.2.0":

recipes/cppcheck/all/conanfile.py

@@ -44,7 +44,7 @@ def generate(self):
         tc.variables["HAVE_RULES"] = self.options.have_rules
         tc.variables["USE_MATCHCOMPILER"] = "Auto"
         tc.variables["ENABLE_OSS_FUZZ"] = False
-        tc.variables["FILESDIR"] = os.path.join(self.package_folder, "res").replace('\\', '/')
+        tc.variables["FILESDIR"] = os.path.join(self.package_folder, "bin").replace('\\', '/')
         tc.generate()
 
         deps = CMakeDeps(self)

recipes/flex/all/conanfile.py

@@ -77,22 +77,12 @@ def package(self):
         autotools.install()
         rmdir(self, os.path.join(self.package_folder, "share"))
         rm(self, "*.la", os.path.join(self.package_folder, "lib"))
-
         fix_apple_shared_install_name(self)
 
     def package_info(self):
         self.cpp_info.libs = ["fl"]
         self.cpp_info.system_libs = ["m"]
 
-        # generate both modules and config files
-        self.cpp_info.set_property("cmake_find_mode", "both")
-        self.cpp_info.set_property("cmake_file_name", "FLEX")
-        self.cpp_info.set_property("cmake_target_name", "FLEX::FLEX")
-        self.cpp_info.set_property("pkg_config_name", "flex")
-
-        self.cpp_info.names["cmake_find_package"] = "FLEX"
-        self.cpp_info.names["cmake_find_package_multi"] = "FLEX"
-
         bindir = os.path.join(self.package_folder, "bin")
         self.output.info("Appending PATH environment variable: {}".format(bindir))
         self.env_info.PATH.append(bindir)

recipes/flex/all/test_package/CMakeLists.txt

@@ -2,6 +2,8 @@ cmake_minimum_required(VERSION 3.15)
 project(test_package LANGUAGES CXX)
 
 find_package(FLEX REQUIRED)
+flex_target(flex_scanner basic_nr.l ${PROJECT_BINARY_DIR}/basic_nr.cpp)
 
-add_executable(${PROJECT_NAME} ${PROJECT_BINARY_DIR}/basic_nr.cpp)
-target_link_libraries(${PROJECT_NAME} PRIVATE FLEX::FLEX)
+add_executable(${PROJECT_NAME} basic_nr.cpp)
+target_include_directories(${PROJECT_NAME} PRIVATE ${FLEX_INCLUDE_DIRS})
+target_link_libraries(${PROJECT_NAME} PRIVATE ${FLEX_LIBRARIES})

recipes/flex/all/test_package/conanfile.py

@@ -9,7 +9,7 @@
 
 class TestPackageConan(ConanFile):
     settings = "os", "arch", "compiler", "build_type"
-    generators = "CMakeToolchain", "CMakeDeps", "VirtualBuildEnv", "VirtualRunEnv"
+    generators = "CMakeToolchain", "VirtualBuildEnv", "VirtualRunEnv"
     test_type = "explicit"
 
     def requirements(self):
@@ -36,16 +36,9 @@ def tested_reference_version():
         assert_flex_version = "flex {}".format(expected_version)
         assert(assert_flex_version in output_str)
 
-    def _create_cpp_file(self):
-        l_file = os.path.join(self.source_folder, "basic_nr.l")
-        output_file = os.path.join(self.build_folder, "basic_nr.cpp")
-        self.run(f"flex --outfile={output_file} --c++ {l_file}")
-        assert os.path.exists(output_file)
-
     def build(self):
-        # Let's check flex version installed and create the basic_nr.cpp file
+        # Let's check flex version installed
         self._assert_expected_version()
-        self._create_cpp_file()
         cmake = CMake(self)
         cmake.configure()
         cmake.build()