Skip to content
Snippets Groups Projects
Commit 797945df authored by Petr Štetiar's avatar Petr Štetiar Committed by Rosen Penev
Browse files

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: default avatarAdam Dov <adov@maxlinear.com>
Suggested-by: default avatarPaul Eggleton <paul.eggleton@linux.intel.com>
References: https://git.yoctoproject.org/poky/commit/?id=f0b9a7cf9f80be1917e45266fa201f464a28c1e5


Signed-off-by: default avatarPetr Štetiar <ynezz@true.cz>
parent 5615ce33
No related branches found
No related tags found
2 merge requests!39Merge openwrt v23.05.0-rc3,!38Merge openwrt v23.05.0-rc3
......@@ -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/
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment