diff options
| author | Petr Štetiar <ynezz@true.cz> | 2022-06-16 13:38:11 +0200 |
|---|---|---|
| committer | Josef Schlehofer <pepe.schlehofer@gmail.com> | 2022-07-13 08:47:54 +0200 |
| commit | 0bab8ae2a7cbbef2236d3d3cc706fc37097a8b29 (patch) | |
| tree | bf40ac1ab3afbfa6959012a2994dc18c2483d13f | |
| parent | 742ef3c1207b5efc19a0e358f3d61d870d277ef3 (diff) | |
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 <adov@maxlinear.com>
Suggested-by: Paul Eggleton <paul.eggleton@linux.intel.com>
References: https://git.yoctoproject.org/poky/commit/?id=f0b9a7cf9f80be1917e45266fa201f464a28c1e5
Signed-off-by: Petr Štetiar <ynezz@true.cz>
(cherry picked from commit 797945dfaa0e7de8d6b0ada472bda63bb27f0cdc)
| -rw-r--r-- | libs/libarchive/Makefile | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/libs/libarchive/Makefile b/libs/libarchive/Makefile index 44d7b7587..45fbaa76f 100644 --- a/libs/libarchive/Makefile +++ b/libs/libarchive/Makefile @@ -91,6 +91,14 @@ else CONFIGURE_ARGS += --with-openssl 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/ |