domenico/openwrt_NSS_ACW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

move all arch fixups from Install to Prepare stage, so that fixed headers are available in $(BUILD_DIR_TOOLCHAIN)/linux-dev/

Browse Source 
SVN-Revision: 14120
This commit is contained in:
Nicolas Thill
2009-01-20 17:05:14 +00:00
parent b5eab7140a
commit ce5b7766e6
1 changed files with 31 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

69
toolchain/kernel-headers/Makefile
View File

@@ -62,18 +62,42 @@ else
define Build/Prepare/all define Build/Prepare/all
mkdir -p $(BUILD_DIR_TOOLCHAIN)/linux-dev/usr/include mkdir -p $(BUILD_DIR_TOOLCHAIN)/linux-dev/usr/include
cp -pLR \ cp -pLR \
$(BUILD_DIR_TOOLCHAIN)/linux/include/asm \ $(PKG_BUILD_DIR)/include/asm \
$(BUILD_DIR_TOOLCHAIN)/linux/include/asm-generic \ $(PKG_BUILD_DIR)/include/asm-generic \
$(BUILD_DIR_TOOLCHAIN)/linux/include/asm-$(LINUX_KARCH) \ $(PKG_BUILD_DIR)/include/asm-$(LINUX_KARCH) \
$(BUILD_DIR_TOOLCHAIN)/linux/include/linux \ $(PKG_BUILD_DIR)/include/linux \
$(BUILD_DIR_TOOLCHAIN)/linux-dev/usr/include/ $(BUILD_DIR_TOOLCHAIN)/linux-dev/usr/include/
endef endef
endif endif
# XXX: the following is needed to build lzma-loader
define Build/Prepare/lzma
$(CP) \
$(PKG_BUILD_DIR)/include/asm-mips/asm.h \
$(PKG_BUILD_DIR)/include/asm-mips/regdef.h \
$(BUILD_DIR_TOOLCHAIN)/linux-dev/usr/include/asm/
endef
# XXX: the following is needed to build final gcc on cris
define Build/Prepare/post/cris
mkdir -p $(BUILD_DIR_TOOLCHAIN)/linux-dev/usr/include/asm/arch
$(CP) \
$(PKG_BUILD_DIR)/include/asm-cris/arch/ptrace.h \
$(BUILD_DIR_TOOLCHAIN)/linux-dev/usr/include/asm/arch/
endef
define Build/Prepare/post/mips
$(call Build/Prepare/lzma)
endef
define Build/Prepare/post/mipsel
$(call Build/Prepare/lzma)
endef
define Build/Prepare define Build/Prepare
$(call Kernel/Prepare/Default) $(call Kernel/Prepare/Default)
ln -sf linux-$(LINUX_VERSION) $(BUILD_DIR_TOOLCHAIN)/linux
$(SED) 's/@expr length/@-expr length/' $(PKG_BUILD_DIR)/Makefile $(SED) 's/@expr length/@-expr length/' $(PKG_BUILD_DIR)/Makefile
ln -sf linux-$(LINUX_VERSION) $(LINUX_HEADERS_DIR)
yes '' | $(KMAKE) oldconfig yes '' | $(KMAKE) oldconfig
$(KMAKE) include/linux/version.h include/asm $(KMAKE) include/linux/version.h include/asm
if [ -d $(PKG_BUILD_DIR)/arch/$(LINUX_KARCH)/include/asm ]; then \ if [ -d $(PKG_BUILD_DIR)/arch/$(LINUX_KARCH)/include/asm ]; then \
@@ -83,6 +107,7 @@ define Build/Prepare
fi fi
$(call Build/Prepare/pre/$(ARCH)) $(call Build/Prepare/pre/$(ARCH))
$(call Build/Prepare/all) $(call Build/Prepare/all)
$(call Build/Prepare/post/$(ARCH))
endef endef
define Build/Configure define Build/Configure
@@ -91,40 +116,8 @@ endef
define Build/Compile define Build/Compile
endef endef
define Build/Install/all
mkdir -p $(TOOLCHAIN_DIR)/usr/include
$(CP) \
$(BUILD_DIR_TOOLCHAIN)/linux-dev/usr/include/* \
$(TOOLCHAIN_DIR)/usr/include/
endef
# XXX: the following is needed to build lzma-loader
define Build/Install/post/lzma
$(CP) \
$(BUILD_DIR_TOOLCHAIN)/linux/include/asm-mips/asm.h \
$(BUILD_DIR_TOOLCHAIN)/linux/include/asm-mips/regdef.h \
$(TOOLCHAIN_DIR)/usr/include/asm/
endef
# XXX: the following is needed to build final gcc on cris
define Build/Install/post/cris
mkdir -p $(TOOLCHAIN_DIR)/usr/include/asm/arch
$(CP) \
$(PKG_BUILD_DIR)/include/asm-cris/arch/ptrace.h \
$(TOOLCHAIN_DIR)/usr/include/asm/arch/
endef
define Build/Install/post/mips
$(call Build/Install/post/lzma)
endef
define Build/Install/post/mipsel
$(call Build/Install/post/lzma)
endef
define Build/Install define Build/Install
$(call Build/Install/all) $(CP) $(BUILD_DIR_TOOLCHAIN)/linux-dev/* $(TOOLCHAIN_DIR)/
$(call Build/Install/post/$(ARCH))
endef endef
define Build/Clean define Build/Clean