Changeset 25598


Ignore:
Timestamp:
2011-02-20T04:25:56+01:00 (6 years ago)
Author:
nbd
Message:

tools/e2fsprogs: move uuid/uuid.h into a subdirectory, it conflicts with a system header file with the same name on darwin

Location:
trunk/tools
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/tools/e2fsprogs/Makefile

    r24866 r25598  
    3131        $(Host/Install/Default) 
    3232        $(MAKE) -C $(HOST_BUILD_DIR)/lib/uuid install 
     33        mkdir -p $(STAGING_DIR_HOST)/include/e2fsprogs 
     34        $(CP) $(STAGING_DIR_HOST)/include/uuid $(STAGING_DIR_HOST)/include/e2fsprogs/ 
     35        rm -rf $(STAGING_DIR_HOST)/include/uuid 
    3336        $(INSTALL_DATA) $(HOST_BUILD_DIR)/lib/uuid/libuuid.a $(STAGING_DIR_HOST)/lib/ 
    3437endef 
  • trunk/tools/mtd-utils/Makefile

    r24129 r25598  
    2222include $(INCLUDE_DIR)/host-build.mk 
    2323 
     24HOST_CFLAGS += -I$(STAGING_DIR_HOST)/include/e2fsprogs 
    2425CFLAGS := $(HOST_CFLAGS) -I$(HOST_BUILD_DIR)/include -L$(HOST_BUILD_DIR) -L$(STAGING_DIR_HOST)/lib -DNO_NATIVE_SUPPORT 
    2526ifneq ($(HOST_OS),Linux) 
  • trunk/tools/qemu/Makefile

    r24487 r25598  
    1616 
    1717include $(INCLUDE_DIR)/host-build.mk 
     18 
     19HOST_CFLAGS += -I$(STAGING_DIR_HOST)/include/e2fsprogs 
    1820 
    1921define Host/Configure 
Note: See TracChangeset for help on using the changeset viewer.