projects
/
librecmc
/
librecmc.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
1dee38a
)
fix everything I broke with the previous patches
author
Mike Baker
<mbm@openwrt.org>
Fri, 4 Aug 2006 09:14:20 +0000
(09:14 +0000)
committer
Mike Baker
<mbm@openwrt.org>
Fri, 4 Aug 2006 09:14:20 +0000
(09:14 +0000)
SVN-Revision: 4436
openwrt/include/package.mk
patch
|
blob
|
history
openwrt/package/busybox/Makefile
patch
|
blob
|
history
openwrt/package/dropbear/Makefile
patch
|
blob
|
history
openwrt/package/iptables/Makefile
patch
|
blob
|
history
openwrt/rules.mk
patch
|
blob
|
history
openwrt/toolchain/libnotimpl/Makefile
patch
|
blob
|
history
openwrt/toolchain/uClibc/Makefile
patch
|
blob
|
history
diff --git
a/openwrt/include/package.mk
b/openwrt/include/package.mk
index fee715043c893ee6035d179ab3b6ce8ea0a0612a..79c29bccf67fd6851949c2a3a74db7a6d2214cac 100644
(file)
--- a/
openwrt/include/package.mk
+++ b/
openwrt/include/package.mk
@@
-283,7
+283,7
@@
define Build/Configure
endef
define Build/Compile/Default
endef
define Build/Compile/Default
- $(MAKE) -C $(PKG_BUILD_DIR) \
+
PATH=$(TARGET_PATH)
$(MAKE) -C $(PKG_BUILD_DIR) \
$(TARGET_CONFIGURE_OPTS) \
CROSS="$(TARGET_CROSS)" \
EXTRA_CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/include -I$(STAGING_DIR)/usr/include" \
$(TARGET_CONFIGURE_OPTS) \
CROSS="$(TARGET_CROSS)" \
EXTRA_CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/include -I$(STAGING_DIR)/usr/include" \
diff --git
a/openwrt/package/busybox/Makefile
b/openwrt/package/busybox/Makefile
index afe7c59e3f7d85c2aac41ef92ba3c33c74bbf6d6..67f7ce1816a12414d74680109258d239566e27cc 100644
(file)
--- a/
openwrt/package/busybox/Makefile
+++ b/
openwrt/package/busybox/Makefile
@@
-38,12
+38,13
@@
endef
define Build/Configure
$(SCRIPT_DIR)/gen_busybox_config.pl $(TOPDIR)/.config > $(PKG_BUILD_DIR)/.config
define Build/Configure
$(SCRIPT_DIR)/gen_busybox_config.pl $(TOPDIR)/.config > $(PKG_BUILD_DIR)/.config
- yes '' | $(MAKE) CC="$(TARGET_CC)" CROSS="$(TARGET_CROSS)" -C $(PKG_BUILD_DIR) oldconfig
+ yes '' | PATH="$(TARGET_PATH)" $(MAKE) CC="$(TARGET_CC)" CROSS="$(TARGET_CROSS)" \
+ -C $(PKG_BUILD_DIR) oldconfig
endef
define Package/busybox/install
endef
define Package/busybox/install
-
$(MAKE) CC="$(TARGET_CC)" CROSS="$(TARGET_CROSS)" PREFIX="$(1
)" \
-
EXTRA_CFLAGS="$(TARGET_CFLAGS)" -C $(PKG_BUILD_DIR) install
+
PATH="$(TARGET_PATH)" $(MAKE) CC="$(TARGET_CC)" CROSS="$(TARGET_CROSS
)" \
+
PREFIX="$(1)"
EXTRA_CFLAGS="$(TARGET_CFLAGS)" -C $(PKG_BUILD_DIR) install
-rm -rf $(1)/lib64
endef
-rm -rf $(1)/lib64
endef
diff --git
a/openwrt/package/dropbear/Makefile
b/openwrt/package/dropbear/Makefile
index cfb2c4135e6a6442514dc90987d4bc58882fce28..9ffc782d9441dff46049d96050b2b0c86b43a7d9 100644
(file)
--- a/
openwrt/package/dropbear/Makefile
+++ b/
openwrt/package/dropbear/Makefile
@@
-82,10
+82,12
@@
endef
define Build/Compile
$(MAKE) -C $(PKG_BUILD_DIR) \
$(TARGET_CONFIGURE_OPTS) \
define Build/Compile
$(MAKE) -C $(PKG_BUILD_DIR) \
$(TARGET_CONFIGURE_OPTS) \
+ LD="$(TARGET_CC)" \
PROGRAMS="dropbear dbclient dropbearkey scp" \
MULTI=1 SCPPROGRESS=1
$(MAKE) -C $(PKG_BUILD_DIR) \
$(TARGET_CONFIGURE_OPTS) \
PROGRAMS="dropbear dbclient dropbearkey scp" \
MULTI=1 SCPPROGRESS=1
$(MAKE) -C $(PKG_BUILD_DIR) \
$(TARGET_CONFIGURE_OPTS) \
+ LD="$(TARGET_CC)" \
PROGRAMS="dropbearconvert"
endef
PROGRAMS="dropbearconvert"
endef
diff --git
a/openwrt/package/iptables/Makefile
b/openwrt/package/iptables/Makefile
index a28b8fd8ed1365040900f7bb7b1c93f50f29247e..bf8124084c384a99af7d3d54dd3694cefe964f52 100644
(file)
--- a/
openwrt/package/iptables/Makefile
+++ b/
openwrt/package/iptables/Makefile
@@
-161,7
+161,7
@@
endef
define Build/Compile
chmod a+x $(PKG_BUILD_DIR)/extensions/.*-test*
mkdir -p $(PKG_INSTALL_DIR)
define Build/Compile
chmod a+x $(PKG_BUILD_DIR)/extensions/.*-test*
mkdir -p $(PKG_INSTALL_DIR)
- $(MAKE) -C $(PKG_BUILD_DIR) \
+
PATH="$(TARGET_PATH)"
$(MAKE) -C $(PKG_BUILD_DIR) \
$(TARGET_CONFIGURE_OPTS) \
CC="$(TARGET_CC)" COPT_FLAGS="$(TARGET_CFLAGS)" \
KERNEL_DIR="$(LINUX_DIR)" PREFIX=/usr \
$(TARGET_CONFIGURE_OPTS) \
CC="$(TARGET_CC)" COPT_FLAGS="$(TARGET_CFLAGS)" \
KERNEL_DIR="$(LINUX_DIR)" PREFIX=/usr \
@@
-171,7
+171,7
@@
endef
define Build/InstallDev
define Build/InstallDev
- $(MAKE) -C $(PKG_BUILD_DIR) \
+
PATH="$(TARGET_PATH)"
$(MAKE) -C $(PKG_BUILD_DIR) \
$(TARGET_CONFIGURE_OPTS) \
CC="$(TARGET_CC)" COPT_FLAGS="$(TARGET_CFLAGS)" \
KERNEL_DIR="$(LINUX_DIR)" PREFIX=/usr \
$(TARGET_CONFIGURE_OPTS) \
CC="$(TARGET_CC)" COPT_FLAGS="$(TARGET_CFLAGS)" \
KERNEL_DIR="$(LINUX_DIR)" PREFIX=/usr \
diff --git
a/openwrt/rules.mk
b/openwrt/rules.mk
index 89adb3efc26dbcfc020544569f7c9f5bb51968e6..2cd8ea9b25a6c76520c42a31dbabd816374f8f4b 100644
(file)
--- a/
openwrt/rules.mk
+++ b/
openwrt/rules.mk
@@
-54,8
+54,7
@@
SED:=$(STAGING_DIR)/bin/sed -i -e
CP:=cp -fpR
ifneq ($(CONFIG_CCACHE),)
CP:=cp -fpR
ifneq ($(CONFIG_CCACHE),)
- export CCACHE_DIR:=$(TOPDIR)/ccache_$(ARCH)
- TARGET_CC:=ccache $(TARGET_CC)
+ TARGET_CC:=CCACHE_DIR=$(TOPDIR)/ccache_$(ARCH) ccache $(TARGET_CC)
endif
HOST_ARCH:=$(shell $(HOSTCC) -dumpmachine | sed -e s'/-.*//' \
endif
HOST_ARCH:=$(shell $(HOSTCC) -dumpmachine | sed -e s'/-.*//' \
diff --git
a/openwrt/toolchain/libnotimpl/Makefile
b/openwrt/toolchain/libnotimpl/Makefile
index bc515ca0800df470494876a99a6ff4b75d889384..214f51c5dc77bbdf52ed2a367cd117f5668d7e1a 100644
(file)
--- a/
openwrt/toolchain/libnotimpl/Makefile
+++ b/
openwrt/toolchain/libnotimpl/Makefile
@@
-12,7
+12,7
@@
PKG_BUILD_DIR := $(TOOL_BUILD_DIR)/libnotimpl
include $(INCLUDE_DIR)/host-build.mk
define cc
include $(INCLUDE_DIR)/host-build.mk
define cc
- $(TARGET_CC) $(TARGET_CFLAGS) -c src/$(1).c -o $(PKG_BUILD_DIR)/$(1).o
+
PATH="$(TARGET_PATH)"
$(TARGET_CC) $(TARGET_CFLAGS) -c src/$(1).c -o $(PKG_BUILD_DIR)/$(1).o
endef
define Build/Prepare
endef
define Build/Prepare
@@
-22,7
+22,7
@@
endef
define Build/Compile
$(call cc,math)
define Build/Compile
$(call cc,math)
- $(TARGET_CROSS)ar rc $(PKG_BUILD_DIR)/libnotimpl.a $(PKG_BUILD_DIR)/*.o
+
PATH="$(TARGET_PATH)"
$(TARGET_CROSS)ar rc $(PKG_BUILD_DIR)/libnotimpl.a $(PKG_BUILD_DIR)/*.o
endef
define Build/Install
endef
define Build/Install
diff --git
a/openwrt/toolchain/uClibc/Makefile
b/openwrt/toolchain/uClibc/Makefile
index bb52ee300f8d8294b84a61126c12c4ea9c337eec..a99c734b92fc3448db04110164c8438ed21a539d 100644
(file)
--- a/
openwrt/toolchain/uClibc/Makefile
+++ b/
openwrt/toolchain/uClibc/Makefile
@@
-55,7
+55,7
@@
endif
mkdir -p $(TOOL_BUILD_DIR)/uClibc_dev/usr/include
mkdir -p $(TOOL_BUILD_DIR)/uClibc_dev/usr/lib
mkdir -p $(TOOL_BUILD_DIR)/uClibc_dev/lib
mkdir -p $(TOOL_BUILD_DIR)/uClibc_dev/usr/include
mkdir -p $(TOOL_BUILD_DIR)/uClibc_dev/usr/lib
mkdir -p $(TOOL_BUILD_DIR)/uClibc_dev/lib
- $(MAKE) -C $(PKG_BUILD_DIR) \
+
PATH=$(TARGET_PATH)
$(MAKE) -C $(PKG_BUILD_DIR) \
PREFIX=$(TOOL_BUILD_DIR)/uClibc_dev/ \
DEVEL_PREFIX=/usr/ \
RUNTIME_PREFIX=$(TOOL_BUILD_DIR)/uClibc_dev/ \
PREFIX=$(TOOL_BUILD_DIR)/uClibc_dev/ \
DEVEL_PREFIX=/usr/ \
RUNTIME_PREFIX=$(TOOL_BUILD_DIR)/uClibc_dev/ \
@@
-68,7
+68,7
@@
define Build/Configure
endef
define Build/Compile
endef
define Build/Compile
- $(MAKE) -C $(PKG_BUILD_DIR) \
+
PATH=$(TARGET_PATH)
$(MAKE) -C $(PKG_BUILD_DIR) \
PREFIX= \
DEVEL_PREFIX=/ \
RUNTIME_PREFIX=/ \
PREFIX= \
DEVEL_PREFIX=/ \
RUNTIME_PREFIX=/ \