From: Petr Štetiar Date: Thu, 16 Jun 2022 11:38:11 +0000 (+0200) Subject: libarchive: fix ext2fs build race error condition X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=2987868384f81e3f6b03c4fb9cebd9fd4009d05c;p=feed%2Fpackages.git libarchive: fix ext2fs build race error condition 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) --- diff --git a/libs/libarchive/Makefile b/libs/libarchive/Makefile index 23d6341b19..d871e88d0a 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/