From 5d1a43f7829e76cc81bac0dada4a9b7343db06fd Mon Sep 17 00:00:00 2001 From: coolsnowwolf Date: Tue, 24 Oct 2017 23:23:45 +0800 Subject: [PATCH] squashfs: use host cflags and fix for x86/x64 vmware firstboot --- package/libs/lzo/Makefile | 4 ---- tools/squashfs/Makefile | 1 + 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/package/libs/lzo/Makefile b/package/libs/lzo/Makefile index 8d85e4652..ef33619d8 100644 --- a/package/libs/lzo/Makefile +++ b/package/libs/lzo/Makefile @@ -42,10 +42,6 @@ CONFIGURE_ARGS += \ TARGET_CFLAGS += $(FPIC) MAKE_FLAGS += CFLAGS_O="$(TARGET_CFLAGS)" -ifeq ($(CONFIG_i386)$(CONFIG_x86_64),) - TARGET_CFLAGS += -DLZO_CFG_NO_UNALIGNED=1 -endif - define Build/InstallDev $(INSTALL_DIR) $(1)/usr/include $(1)/usr/lib $(CP) $(PKG_INSTALL_DIR)/usr/include/lzo $(1)/usr/include/ diff --git a/tools/squashfs/Makefile b/tools/squashfs/Makefile index 27adca1d7..87f6e8fd9 100644 --- a/tools/squashfs/Makefile +++ b/tools/squashfs/Makefile @@ -21,6 +21,7 @@ include $(INCLUDE_DIR)/host-build.mk define Host/Compile $(MAKE) -C $(HOST_BUILD_DIR)/squashfs-tools \ CC="$(HOSTCC)" \ + CFLAGS="$(HOST_CFLAGS) -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -I." \ CXX="$(CXX)" \ LZMAPATH=$(STAGING_DIR_HOST)/lib \ mksquashfs-lzma unsquashfs-lzma