libelf: fix build failure using mingw (#25276)

* libelf: fix missing inclusion of config.h on windows, remove test_v1_package * Assume settings_build is defined --------- Co-authored-by: Luis Caro Campos <[email protected]>
conan-io · Dec 6, 2024 · 37116e6 · 37116e6
1 parent 13febde
commit 37116e6
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 32 deletions.
diff --git a/recipes/libelf/all/CMakeLists.txt b/recipes/libelf/all/CMakeLists.txt
@@ -3,7 +3,7 @@ project(elf LANGUAGES C)
 
 if(EXISTS "${LIBELF_SRC_DIR}/lib/sys_elf.h.w32")
     file(RENAME "${LIBELF_SRC_DIR}/lib/sys_elf.h.w32" "${LIBELF_SRC_DIR}/lib/sys_elf.h")
-    file(RENAME "${LIBELF_SRC_DIR}/lib/config.h.w32" "${LIBELF_SRC_DIR}/config.h")
+    file(RENAME "${LIBELF_SRC_DIR}/lib/config.h.w32" "${LIBELF_SRC_DIR}/lib/config.h")
 endif()
 
 file(GLOB_RECURSE SOURCES "${LIBELF_SRC_DIR}/lib/*.c")
@@ -15,7 +15,7 @@ set_target_properties(${PROJECT_NAME} PROPERTIES
     WINDOWS_EXPORT_ALL_SYMBOLS TRUE
 )
 target_include_directories(${PROJECT_NAME} SYSTEM PUBLIC "${LIBELF_SRC_DIR}/lib")
-target_compile_definitions(${PROJECT_NAME} PUBLIC HAVE_MEMCMP=1 HAVE_MEMCPY=1 HAVE_MEMMOVE=1)
+target_compile_definitions(${PROJECT_NAME} PUBLIC HAVE_MEMCMP=1 HAVE_MEMCPY=1 HAVE_MEMMOVE=1 HAVE_CONFIG_H=1)
 
 include(GNUInstallDirs)
 

diff --git a/recipes/libelf/all/conanfile.py b/recipes/libelf/all/conanfile.py
@@ -31,10 +31,6 @@ class LibelfConan(ConanFile):
 
     exports_sources = "CMakeLists.txt"
 
-    @property
-    def _settings_build(self):
-        return getattr(self, "settings_build", self.settings)
-
     def config_options(self):
         if self.settings.os == "Windows":
             del self.options.fPIC
@@ -58,7 +54,7 @@ def build_requirements(self):
         if self.settings.os != "Windows":
             self.tool_requires("autoconf/2.71")
             self.tool_requires("gnu-config/cci.20210814")
-            if self._settings_build.os == "Windows":
+            if self.settings_build.os == "Windows":
                 self.win_bash = True
                 if not self.conf.get("tools.microsoft.bash:path", check_type=str):
                     self.tool_requires("msys2/cci.latest")

diff --git a/recipes/libelf/all/test_v1_package/CMakeLists.txt b/recipes/libelf/all/test_v1_package/CMakeLists.txt
diff --git a/recipes/libelf/all/test_v1_package/conanfile.py b/recipes/libelf/all/test_v1_package/conanfile.py