From 2987868384f81e3f6b03c4fb9cebd9fd4009d05c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20=C5=A0tetiar?= Date: Thu, 16 Jun 2022 13:38:11 +0200 Subject: [PATCH] libarchive: fix ext2fs build race error condition MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit libarchive looks for ext2fs headers during configure, and if it finds them it will expect to find them during compile, or on the rare occasion when they aren't it will fail: libarchive/archive_entry.c:59:55: fatal error: ext2fs/ext2_fs.h: No such file or directory As we just need headers for some type constants, let's re-use headers from tools/e2fsprogs package which are always available. Reported-by: Adam Dov Suggested-by: Paul Eggleton References: https://git.yoctoproject.org/poky/commit/?id=f0b9a7cf9f80be1917e45266fa201f464a28c1e5 Signed-off-by: Petr Štetiar (cherry picked from commit 797945dfaa0e7de8d6b0ada472bda63bb27f0cdc) --- libs/libarchive/Makefile | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/libs/libarchive/Makefile b/libs/libarchive/Makefile index 23d6341b1..d871e88d0 100644 --- a/libs/libarchive/Makefile +++ b/libs/libarchive/Makefile @@ -104,6 +104,14 @@ else CMAKE_OPTIONS += -DENABLE_OPENSSL=ON endif +EXTRA_CFLAGS += "-I$(PKG_BUILD_DIR)/extra-includes" + +define Build/Configure + $(INSTALL_DIR) $(PKG_BUILD_DIR)/extra-includes/ + $(CP) -R $(STAGING_DIR_HOST)/include/ext2fs $(PKG_BUILD_DIR)/extra-includes/ + $(Build/Configure/Default) +endef + define Build/InstallDev $(INSTALL_DIR) $(1)/usr/include $(CP) $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include/