mr/openwrt
2
0
Fork 1
Code Issues 7 Pull Requests Releases Wiki Activity

Fix libuuid header location and reenable building of mkfs.ubifs

Browse Source 
SVN-Revision: 19113
This commit is contained in:
Lars-Peter Clausen 2010-01-13 05:21:50 +00:00
parent 75d5301b3e
commit 5cc66964c1
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tools/libuuid/Makefile
View File

@ -36,13 +36,13 @@ define Host/Compile
endef endef
define Host/Install define Host/Install
$(INSTALL_DIR) $(STAGING_DIR_HOST)/{lib,include} $(INSTALL_DIR) $(STAGING_DIR_HOST)/{lib,include/uuid}
$(CP) $(HOST_BUILD_DIR)/lib/uuid/uuid.h $(STAGING_DIR_HOST)/include/ $(CP) $(HOST_BUILD_DIR)/lib/uuid/uuid.h $(STAGING_DIR_HOST)/include/uuid/
$(CP) $(HOST_BUILD_DIR)/lib/uuid/libuuid.{so*,a} $(STAGING_DIR_HOST)/lib/ $(CP) $(HOST_BUILD_DIR)/lib/uuid/libuuid.{so*,a} $(STAGING_DIR_HOST)/lib/
endef endef
define Host/Clean define Host/Clean
rm -f $(STAGING_DIR_HOST)/include/uuid.h rm -f $(STAGING_DIR_HOST)/include/uuid/uuid.h
rm -f $(STAGING_DIR_HOST)/lib/uuid/libuuid.{so*,a} rm -f $(STAGING_DIR_HOST)/lib/uuid/libuuid.{so*,a}
$(call Host/Clean/Default) $(call Host/Clean/Default)
endef endef

8
tools/mtd-utils/Makefile
View File

@ -21,7 +21,7 @@ HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/$(PKG_NAME)-$(PKG_VERSION)
include $(INCLUDE_DIR)/host-build.mk include $(INCLUDE_DIR)/host-build.mk
CFLAGS := $(HOST_CFLAGS) -I$(HOST_BUILD_DIR)/include -L$(HOST_BUILD_DIR) CFLAGS := $(HOST_CFLAGS) -I$(HOST_BUILD_DIR)/include -L$(HOST_BUILD_DIR) -L$(STAGING_DIR_HOST)/lib
ifneq ($(HOST_OS),Linux) ifneq ($(HOST_OS),Linux)
CFLAGS += -Dloff_t=off_t -D__BYTE_ORDER=BYTE_ORDER -include getline.h -include endian.h CFLAGS += -Dloff_t=off_t -D__BYTE_ORDER=BYTE_ORDER -include getline.h -include endian.h
endif endif
@ -39,17 +39,21 @@ define Host/Compile
$(MAKE) -C $(HOST_BUILD_DIR)/ubi-utils \ $(MAKE) -C $(HOST_BUILD_DIR)/ubi-utils \
$(MTD_MAKEOPTS) \ $(MTD_MAKEOPTS) \
TARGETS=ubinize TARGETS=ubinize
$(MAKE) -C $(HOST_BUILD_DIR)/mkfs.ubifs \
$(MTD_MAKEOPTS) \
BUILDDIR="$(HOST_BUILD_DIR)/mkfs.ubifs"
endef endef
define Host/Install define Host/Install
$(CP) \ $(CP) \
$(HOST_BUILD_DIR)/mkfs.jffs2 \ $(HOST_BUILD_DIR)/mkfs.jffs2 \
$(HOST_BUILD_DIR)/mkfs.ubifs/mkfs.ubifs \
$(HOST_BUILD_DIR)/ubinize \ $(HOST_BUILD_DIR)/ubinize \
$(STAGING_DIR_HOST)/bin/ $(STAGING_DIR_HOST)/bin/
endef endef
define Host/Clean define Host/Clean
rm -f $(STAGING_DIR_HOST)/bin/{mkfs.jffs2,ubinize} rm -f $(STAGING_DIR_HOST)/bin/{mkfs.jffs2,mkfs.ubifs,ubinize}
endef endef
$(eval $(call HostBuild)) $(eval $(call HostBuild))