tools/e2fsprogs: move uuid/uuid.h into a subdirectory, it conflicts with a system...

SVN-Revision: 25598

diff --git a/tools/e2fsprogs/Makefile b/tools/e2fsprogs/Makefile
index 413e965a0ecc1d48f44dce305c8fb0ceb6699441..0bfcfb4f0f12c5986c00c213b333ef9ce66e4af1 100644 (file)
--- a/tools/e2fsprogs/Makefile
+++ b/tools/e2fsprogs/Makefile
@@ -30,6 +30,9 @@ CONFIGURE_ARGS += \
 define Host/Install
        $(Host/Install/Default)
        $(MAKE) -C $(HOST_BUILD_DIR)/lib/uuid install
 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
 
        $(INSTALL_DATA) $(HOST_BUILD_DIR)/lib/uuid/libuuid.a $(STAGING_DIR_HOST)/lib/
 endef
 

diff --git a/tools/mtd-utils/Makefile b/tools/mtd-utils/Makefile
index 7dc31f51a509a58429569010acb168f541d59537..4d5117b9b799c9203ff173cf6e11265014808c70 100644 (file)
--- a/tools/mtd-utils/Makefile
+++ b/tools/mtd-utils/Makefile
@@ -21,6 +21,7 @@ HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/$(PKG_NAME)-$(PKG_VERSION)
 
 include $(INCLUDE_DIR)/host-build.mk
 
 
 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
 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

diff --git a/tools/qemu/Makefile b/tools/qemu/Makefile
index 37a510cf92b237a6fad6c4423b520845563d26cf..c0d587b243f752b2ba2700efcf51de219b284102 100644 (file)
--- a/tools/qemu/Makefile
+++ b/tools/qemu/Makefile
@@ -16,6 +16,8 @@ PKG_MD5SUM:=397a0d665da8ba9d3b9583629f3d6421
 
 include $(INCLUDE_DIR)/host-build.mk
 
 
 include $(INCLUDE_DIR)/host-build.mk
 

+HOST_CFLAGS += -I$(STAGING_DIR_HOST)/include/e2fsprogs
+

 define Host/Configure
        (cd $(HOST_BUILD_DIR); \
                CFLAGS="$(HOST_CFLAGS)" \
 define Host/Configure
        (cd $(HOST_BUILD_DIR); \
                CFLAGS="$(HOST_CFLAGS)" \