elfutils: Revise the recipe to support Conan V2 and add the latest version 0.189

recipes/elfutils/all/conandata.yml

@@ -1,18 +1,26 @@
 sources:
+  "0.189":
+    url: "https://sourceware.org/elfutils/ftp/0.189/elfutils-0.189.tar.bz2"
+    sha256: "39bd8f1a338e2b7cd4abc3ff11a0eddc6e690f69578a57478d8179b4148708c8"
   "0.186":
     url: "https://sourceware.org/elfutils/ftp/0.186/elfutils-0.186.tar.bz2"
     sha256: "7f6fb9149b1673d38d9178a0d3e0fb8a1ec4f53a9f4c2ff89469609879641177"
   "0.180":
     url: "https://sourceware.org/elfutils/ftp/0.180/elfutils-0.180.tar.bz2"
     sha256: "b827b6e35c59d188ba97d7cf148fa8dc6f5c68eb6c5981888dfdbb758c0b569d"
 patches:
+  "0.189":
+    - patch_file: "patches/0001-enable-static-library-building.patch"
+    - patch_file: "patches/0002-disable-werror-flag.patch"
+      patch_description: "Enable static library building, and disable Werror flag."
+      patch_type: "conan"
   "0.186":
-    - base_path: "source_subfolder"
-      patch_file: "patches/0.186-0001-Add-enable-werror-configure-option.patch"
-    - base_path: "source_subfolder"
-      patch_file: "patches/0.186-0002-add-enable-static-option-to-configure.patch"
+    - patch_file: "patches/0001-enable-static-library-building.patch"
+    - patch_file: "patches/0002-disable-werror-flag.patch"
+      patch_description: "Enable static library building, and disable Werror flag."
+      patch_type: "conan"
   "0.180":
-    - base_path: "source_subfolder"
-      patch_file: "patches/0.180-0001-Add-enable-werror-configure-option.patch"
-    - base_path: "source_subfolder"
-      patch_file: "patches/0.180-0002-add-enable-static-option-to-configure.patch"
+    - patch_file: "patches/0001-enable-static-library-building.patch"
+    - patch_file: "patches/0002-disable-werror-flag.patch"
+      patch_description: "Enable static library building, and disable Werror flag."
+      patch_type: "conan"

recipes/elfutils/all/patches/0.180-0002-add-enable-static-option-to-configure.patch → recipes/elfutils/all/patches/0001-enable-static-library-building.patch

@@ -1,10 +1,11 @@
---- configure.ac
-+++ configure.ac
-@@ -393,8 +393,25 @@
+diff --git a/configure.ac b/configure.ac
+index 6e881fa..3b56d3a 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -414,8 +414,26 @@ AS_HELP_STRING([--enable-install-elfh],[install elf.h in include dir]),
                 [install_elfh=$enableval], [install_elfh=no])
  AM_CONDITIONAL(INSTALL_ELFH, test "$install_elfh" = yes)
 
-+
 +AC_MSG_CHECKING([whether to build elfutils as a static library])
 +AC_ARG_ENABLE([static],
 +AS_HELP_STRING([--enable-static],[build elfutils as static libraries]),
@@ -20,6 +21,8 @@
 +  fi
 +  AC_MSG_RESULT([no])
 +fi
++
++
 +
  AM_CONDITIONAL(BUILD_STATIC, [dnl
 -test "$use_gprof" = yes -o "$use_gcov" = yes])

recipes/elfutils/all/patches/0002-disable-werror-flag.patch

@@ -0,0 +1,22 @@
+diff --git a/config/eu.am b/config/eu.am
+index e6c241f..fb92465 100644
+--- a/config/eu.am
++++ b/config/eu.am
+@@ -99,7 +99,7 @@ AM_CFLAGS = -std=gnu99 -Wall -Wshadow -Wformat=2 \
+ 	    $(LOGICAL_OP_WARNING) $(DUPLICATED_COND_WARNING) \
+ 	    $(NULL_DEREFERENCE_WARNING) $(IMPLICIT_FALLTHROUGH_WARNING) \
+ 	    $(USE_AFTER_FREE3_WARNING) \
+-	    $(if $($(*F)_no_Werror),,-Werror) \
++	    $(if $($(*F)_no_Werror),,) \
+ 	    $(if $($(*F)_no_Wunused),,-Wunused -Wextra) \
+ 	    $(if $($(*F)_no_Wstack_usage),,$(STACK_USAGE_WARNING)) \
+ 	    $(if $($(*F)_no_Wpacked_not_aligned),$(NO_PACKED_NOT_ALIGNED_WARNING),) \
+@@ -109,7 +109,7 @@ AM_CXXFLAGS = -std=c++11 -Wall -Wshadow \
+ 	   $(TRAMPOLINES_WARNING) \
+ 	   $(LOGICAL_OP_WARNING) $(DUPLICATED_COND_WARNING) \
+ 	   $(NULL_DEREFERENCE_WARNING) $(IMPLICIT_FALLTHROUGH_WARNING) \
+-	   $(if $($(*F)_no_Werror),,-Werror) \
++	   $(if $($(*F)_no_Werror),,) \
+ 	   $(if $($(*F)_no_Wunused),,-Wunused -Wextra) \
+ 	   $(if $($(*F)_no_Wstack_usage),,$(STACK_USAGE_WARNING)) \
+ 	   $(if $($(*F)_no_Wpacked_not_aligned),$(NO_PACKED_NOT_ALIGNED_WARNING),) \

recipes/elfutils/all/test_package/CMakeLists.txt

@@ -1,8 +1,7 @@
 cmake_minimum_required(VERSION 3.1)
 project(test_package C)
 
-include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake)
-conan_basic_setup()
+find_package(elfutils REQUIRED CONFIG)
 
 add_executable(${PROJECT_NAME} test_package.c)
-target_link_libraries(${PROJECT_NAME} ${CONAN_LIBS})
+target_link_libraries(${PROJECT_NAME} PRIVATE elfutils::elfutils)

recipes/elfutils/all/test_package/conanfile.py

@@ -1,25 +1,31 @@
-from conans import ConanFile, CMake, tools
+from conan import ConanFile
+from conan.tools.build import can_run
+from conan.tools.cmake import CMake, cmake_layout
 import os
 
 
 class TestPackageConan(ConanFile):
-    settings = "os", "compiler", "build_type", "arch"
-    generators = "cmake"
+    settings = "os", "arch", "compiler", "build_type"
+    generators = "CMakeToolchain", "CMakeDeps", "VirtualRunEnv"
+    test_type = "explicit"
+
+    def layout(self):
+        cmake_layout(self)
+
+    def requirements(self):
+        self.requires(self.tested_reference_str)
 
     def build(self):
         cmake = CMake(self)
         cmake.configure()
         cmake.build()
 
     def test(self):
-        self.run("eu-ar --version", run_environment=True)
-
-        bin_path = os.path.join("bin", "test_package")
+        self.run("eu-ar --version", env="conanbuild")
+        bin_path = os.path.join(self.cpp.build.bindirs[0], "test_package")
         archive_path = "archive.a"
-
-        self.run("eu-ar r {0} {1}".format(archive_path, bin_path), run_environment=True)
-        self.run("eu-objdump -d {0}".format(bin_path), run_environment=True)
-        if not tools.cross_building(self.settings):            
-            self.run("{} {}".format(bin_path, bin_path), run_environment=True)
-
-            self.run("{} {}".format(bin_path, archive_path), run_environment=True)
+        self.run(f"eu-ar r {archive_path} {bin_path}", env="conanbuild")
+        self.run(f"eu-objdump -d {bin_path}", env="conanbuild")
+        if can_run(self):
+            self.run(f"{bin_path} {bin_path}", env="conanrun")
+            self.run(f"{bin_path} {archive_path}", env="conanrun")

recipes/elfutils/all/test_v1_package/CMakeLists.txt

@@ -0,0 +1,8 @@
+cmake_minimum_required(VERSION 3.1)
+project(test_package)
+
+include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake)
+conan_basic_setup(TARGETS)
+
+add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/../test_package
+                 ${CMAKE_CURRENT_BINARY_DIR}/test_package)

recipes/elfutils/all/test_v1_package/conanfile.py

@@ -0,0 +1,22 @@
+from conans import ConanFile, CMake, tools
+import os
+
+
+class TestPackageConan(ConanFile):
+    settings = "os", "arch", "compiler", "build_type"
+    generators = "cmake", "cmake_find_package_multi"
+
+    def build(self):
+        cmake = CMake(self)
+        cmake.configure()
+        cmake.build()
+
+    def test(self):
+        self.run("eu-ar --version", run_environment=True)
+        bin_path = os.path.join("bin", "test_package")
+        archive_path = "archive.a"
+        self.run(f"eu-ar r {archive_path} {bin_path}", run_environment=True)
+        self.run(f"eu-objdump -d {bin_path}", run_environment=True)
+        if not tools.cross_building(self):
+            self.run(f"{bin_path} {bin_path}", run_environment=True)
+            self.run(f"{bin_path} {archive_path}", run_environment=True)

recipes/elfutils/config.yml

@@ -1,4 +1,6 @@
 versions:
+  "0.189":
+    folder: all
   "0.186":
     folder: all
   "0.180":