tools/e2fsprogs: move uuid/uuid.h into a subdirectory, it conflicts with a system header file with the same name on darwin
SVN-Revision: 25598
This commit is contained in:
parent
d56fe0cf53
commit
11c08a39bc
3 changed files with 6 additions and 0 deletions
|
@ -30,6 +30,9 @@ CONFIGURE_ARGS += \
|
|||
define Host/Install
|
||||
$(Host/Install/Default)
|
||||
$(MAKE) -C $(HOST_BUILD_DIR)/lib/uuid install
|
||||
mkdir -p $(STAGING_DIR_HOST)/include/e2fsprogs
|
||||
$(CP) $(STAGING_DIR_HOST)/include/uuid $(STAGING_DIR_HOST)/include/e2fsprogs/
|
||||
rm -rf $(STAGING_DIR_HOST)/include/uuid
|
||||
$(INSTALL_DATA) $(HOST_BUILD_DIR)/lib/uuid/libuuid.a $(STAGING_DIR_HOST)/lib/
|
||||
endef
|
||||
|
||||
|
|
|
@ -21,6 +21,7 @@ HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/$(PKG_NAME)-$(PKG_VERSION)
|
|||
|
||||
include $(INCLUDE_DIR)/host-build.mk
|
||||
|
||||
HOST_CFLAGS += -I$(STAGING_DIR_HOST)/include/e2fsprogs
|
||||
CFLAGS := $(HOST_CFLAGS) -I$(HOST_BUILD_DIR)/include -L$(HOST_BUILD_DIR) -L$(STAGING_DIR_HOST)/lib -DNO_NATIVE_SUPPORT
|
||||
ifneq ($(HOST_OS),Linux)
|
||||
CFLAGS += -Dloff_t=off_t -D__BYTE_ORDER=BYTE_ORDER -include getline.h -include endian.h -I$(CURDIR)/include -include fls.h
|
||||
|
|
|
@ -16,6 +16,8 @@ PKG_MD5SUM:=397a0d665da8ba9d3b9583629f3d6421
|
|||
|
||||
include $(INCLUDE_DIR)/host-build.mk
|
||||
|
||||
HOST_CFLAGS += -I$(STAGING_DIR_HOST)/include/e2fsprogs
|
||||
|
||||
define Host/Configure
|
||||
(cd $(HOST_BUILD_DIR); \
|
||||
CFLAGS="$(HOST_CFLAGS)" \
|
||||
|
|
Loading…
Reference in a new issue