fix everything I broke with the previous patches
SVN-Revision: 4436
This commit is contained in:
parent
1dee38a88e
commit
20922bcde7
7 changed files with 14 additions and 12 deletions
|
@ -283,7 +283,7 @@ define Build/Configure
|
|||
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" \
|
||||
|
|
|
@ -38,12 +38,13 @@ endef
|
|||
|
||||
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
|
||||
$(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
|
||||
|
||||
|
|
|
@ -82,10 +82,12 @@ endef
|
|||
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) \
|
||||
LD="$(TARGET_CC)" \
|
||||
PROGRAMS="dropbearconvert"
|
||||
endef
|
||||
|
||||
|
|
|
@ -161,7 +161,7 @@ endef
|
|||
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 \
|
||||
|
@ -171,7 +171,7 @@ endef
|
|||
|
||||
|
||||
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 \
|
||||
|
|
|
@ -54,8 +54,7 @@ SED:=$(STAGING_DIR)/bin/sed -i -e
|
|||
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'/-.*//' \
|
||||
|
|
|
@ -12,7 +12,7 @@ PKG_BUILD_DIR := $(TOOL_BUILD_DIR)/libnotimpl
|
|||
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
|
||||
|
@ -22,7 +22,7 @@ endef
|
|||
|
||||
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
|
||||
|
|
|
@ -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
|
||||
$(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/ \
|
||||
|
@ -68,7 +68,7 @@ define Build/Configure
|
|||
endef
|
||||
|
||||
define Build/Compile
|
||||
$(MAKE) -C $(PKG_BUILD_DIR) \
|
||||
PATH=$(TARGET_PATH) $(MAKE) -C $(PKG_BUILD_DIR) \
|
||||
PREFIX= \
|
||||
DEVEL_PREFIX=/ \
|
||||
RUNTIME_PREFIX=/ \
|
||||
|
|
Loading…
Reference in a new issue