aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2006-10-10 16:36:47 +0000
committerFelix Fietkau <nbd@openwrt.org>2006-10-10 16:36:47 +0000
commitca61154ca053958b6be1d03f1b3122748eec60d4 (patch)
treeb275a0bc36817da98ed2502da35edcc9fe374f99
parent00654ff3d41f275c6f92b73b62615de4d990f510 (diff)
downloadupstream-ca61154ca053958b6be1d03f1b3122748eec60d4.tar.gz
upstream-ca61154ca053958b6be1d03f1b3122748eec60d4.tar.bz2
upstream-ca61154ca053958b6be1d03f1b3122748eec60d4.zip
fix gene2fs build on freebsd
SVN-Revision: 5019
-rw-r--r--openwrt/toolchain/Makefile7
-rw-r--r--openwrt/tools/Makefile13
-rw-r--r--openwrt/tools/ext2fs/Makefile4
3 files changed, 14 insertions, 10 deletions
diff --git a/openwrt/toolchain/Makefile b/openwrt/toolchain/Makefile
index ed563f00ed..2d8d88219d 100644
--- a/openwrt/toolchain/Makefile
+++ b/openwrt/toolchain/Makefile
@@ -22,6 +22,7 @@ all: install
download: $(TARGETS_DOWNLOAD)
install: $(TARGETS_INSTALL)
clean: $(TARGETS_CLEAN)
+$(TARGETS_INSTALL): $(STAGING_DIR)/$(REAL_GNU_TARGET_NAME)
uClibc-prepare: kernel-headers-prepare
ifeq ($(CONFIG_NATIVE_TOOLCHAIN),)
@@ -34,6 +35,10 @@ gcc-install: uClibc-install
TOOLCHAIN_STAMP_DIR:=$(STAGING_DIR)/stampfiles
+$(STAGING_DIR)/$(REAL_GNU_TARGET_NAME):
+ @mkdir -p $@
+ @ln -sf ../lib $@/lib
+
$(TOOLCHAIN_STAMP_DIR):
mkdir -p $@
@@ -43,7 +48,7 @@ $(TOOLCHAIN_BUILD_DIR):
%-download: FORCE
$(MAKE) -C $(patsubst %-download,%,$@) download
-%-prepare: $(TOOLCHAIN_STAMP_DIR) $(STAGING_DIR) $(TOOLCHAIN_BUILD_DIR) FORCE
+%-prepare: $(TOOLCHAIN_STAMP_DIR) $(STAGING_DIR)/$(REAL_GNU_TARGET_NAME) $(TOOLCHAIN_BUILD_DIR) FORCE
@[ -f $(TOOLCHAIN_STAMP_DIR)/.toolchain_$@ ] || { \
$(MAKE) -C $(patsubst %-prepare,%,$@) prepare; \
}
diff --git a/openwrt/tools/Makefile b/openwrt/tools/Makefile
index 741fd48f6a..c8fad23236 100644
--- a/openwrt/tools/Makefile
+++ b/openwrt/tools/Makefile
@@ -10,6 +10,7 @@ include $(TOPDIR)/rules.mk
TARGETS-y:=sed sstrip ipkg-utils ext2fs squashfs mtd-utils lzma mkimage
TARGETS_DOWNLOAD:=$(patsubst %,%-download,$(TARGETS-y))
+TARGETS_PREPARE:=$(patsubst %,%-prepare,$(TARGETS-y))
TARGETS_INSTALL:=$(patsubst %,%-install,$(TARGETS-y))
TARGETS_CLEAN:=$(patsubst %,%-clean,$(TARGETS-y))
@@ -25,13 +26,9 @@ TOOL_STAMP_DIR:=$(STAGING_DIR)/stampfiles
$(TOOL_STAMP_DIR):
mkdir -p $@
-$(STAGING_DIR):
- @mkdir -p $@/lib
- @mkdir -p $@/include
- @mkdir -p $@/include-host
- $(CP) ./include/*.h $@/include-host/
- @ln -sf ../lib $@/$(REAL_GNU_TARGET_NAME)/lib
- @mkdir -p $@/$(REAL_GNU_TARGET_NAME)
+$(STAGING_DIR)/include-host:
+ @mkdir -p $@
+ @$(CP) ./include/*.h $@/
$(TOOL_BUILD_DIR):
@mkdir -p $@
@@ -39,7 +36,7 @@ $(TOOL_BUILD_DIR):
%-download: FORCE
$(MAKE) -C $(patsubst %-download,%,$@) download
-%-prepare: $(TOOL_STAMP_DIR) $(STAGING_DIR) $(TOOL_BUILD_DIR) FORCE
+%-prepare: $(TOOL_STAMP_DIR) $(STAGING_DIR)/include-host $(TOOL_BUILD_DIR) FORCE
@[ -f $(TOOL_STAMP_DIR)/.tool_$@ ] || { \
$(MAKE) -C $(patsubst %-prepare,%,$@) prepare; \
}
diff --git a/openwrt/tools/ext2fs/Makefile b/openwrt/tools/ext2fs/Makefile
index dd60a7eb9a..f10adbb6c3 100644
--- a/openwrt/tools/ext2fs/Makefile
+++ b/openwrt/tools/ext2fs/Makefile
@@ -42,7 +42,9 @@ define Build/Configure
endef
define Build/Compile
- $(MAKE) -C $(PKG_BUILD_DIR) all
+ $(MAKE) -C $(PKG_BUILD_DIR) \
+ CFLAGS="-O2 -I $(STAGING_DIR)/include-host -include getline.h" \
+ all
endef
define Build/Install