mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2024-11-23 19:05:56 +02:00
uClibc: split the package into the main directory and the headers/ and utils/ subdirectories to clean up build order and fix quilt support
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@32557 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
nbd
parent
b284b583be
commit
db73773bde
@ -29,6 +29,10 @@ curdir:=toolchain
|
||||
|
||||
# subdirectories to descend into
|
||||
$(curdir)/builddirs := $(if $(CONFIG_GDB),gdb) $(if $(CONFIG_INSIGHT),insight) $(if $(CONFIG_EXTERNAL_TOOLCHAIN),wrapper,kernel-headers binutils gcc/minimal gcc/initial gcc/final $(LIBC))
|
||||
ifdef CONFIG_USE_UCLIBC
|
||||
$(curdir)/builddirs += $(LIBC)/headers
|
||||
$(curdir)/builddirs += $(LIBC)/utils
|
||||
endif
|
||||
$(curdir)/builddirs-compile:=$($(curdir)/builddirs-prepare)
|
||||
$(curdir)/builddirs-install:=$($(curdir)/builddirs-compile)
|
||||
|
||||
@ -37,12 +41,22 @@ ifeq ($(CONFIG_EXTERNAL_TOOLCHAIN),)
|
||||
$(curdir)/$(LIBC)/prepare:=$(curdir)/kernel-headers/install
|
||||
$(curdir)/gcc/minimal/compile:=$(curdir)/binutils/install
|
||||
$(curdir)/kernel-headers/install:=$(curdir)/gcc/minimal/install
|
||||
$(curdir)/gcc/initial/compile:=$(curdir)/$(LIBC)/prepare
|
||||
$(curdir)/gcc/initial/prepare:=$(curdir)/gcc/minimal/prepare
|
||||
$(curdir)/gcc/final/prepare:=$(curdir)/gcc/initial/prepare
|
||||
$(curdir)/$(LIBC)/compile:=$(curdir)/gcc/initial/install
|
||||
$(curdir)/gcc/final/compile:=$(curdir)/$(LIBC)/compile
|
||||
$(curdir)/$(LIBC)/install:=$(curdir)/gcc/final/install
|
||||
|
||||
ifdef CONFIG_USE_UCLIBC
|
||||
$(curdir)/gcc/initial/compile:=$(curdir)/$(LIBC)/headers/install
|
||||
$(curdir)/$(LIBC)/compile:=$(curdir)/gcc/initial/install
|
||||
$(curdir)/gcc/final/compile:=$(curdir)/$(LIBC)/install
|
||||
$(curdir)/$(LIBC)/utils/compile:=$(curdir)/gcc/final/install
|
||||
$(curdir)/$(LIBC)/prepare:=$(curdir)/$(LIBC)/headers/prepare
|
||||
$(curdir)/$(LIBC)/utils/prepare:=$(curdir)/$(LIBC)/headers/prepare
|
||||
else
|
||||
$(curdir)/$(LIBC)/compile:=$(curdir)/gcc/initial/install
|
||||
$(curdir)/$(LIBC)/install:=$(curdir)/gcc/final/install
|
||||
$(curdir)/gcc/initial/compile:=$(curdir)/$(LIBC)/prepare
|
||||
$(curdir)/gcc/final/compile:=$(curdir)/$(LIBC)/compile
|
||||
endif
|
||||
endif
|
||||
|
||||
ifdef CONFIG_GCC_VERSION_LLVM
|
||||
|
||||
@ -1,45 +1,9 @@
|
||||
#
|
||||
# Copyright (C) 2006-2012 OpenWrt.org
|
||||
#
|
||||
# This is free software, licensed under the GNU General Public License v2.
|
||||
# See /LICENSE for more information.
|
||||
#
|
||||
include $(TOPDIR)/rules.mk
|
||||
include $(INCLUDE_DIR)/target.mk
|
||||
PATH_PREFIX=.
|
||||
|
||||
PKG_NAME:=uClibc
|
||||
PKG_VERSION:=$(call qstrip,$(CONFIG_UCLIBC_VERSION))
|
||||
PKG_SOURCE_URL:=http://www.uclibc.org/downloads
|
||||
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
|
||||
LIBC_SO_VERSION:=$(PKG_VERSION)
|
||||
PATCH_DIR:=./patches-$(PKG_VERSION)
|
||||
CONFIG_DIR:=./config-$(PKG_VERSION)
|
||||
|
||||
PKG_MD5SUM_0.9.33.2 = a338aaffc56f0f5040e6d9fa8a12eda1
|
||||
PKG_MD5SUM=$(PKG_MD5SUM_$(PKG_VERSION))
|
||||
|
||||
HOST_BUILD_DIR:=$(BUILD_DIR_TOOLCHAIN)/$(PKG_NAME)-$(PKG_VERSION)
|
||||
|
||||
include $(INCLUDE_DIR)/toolchain-build.mk
|
||||
|
||||
HOST_STAMP_BUILT:=$(TOOLCHAIN_DIR)/stamp/.uclibc_installed
|
||||
HOST_STAMP_INSTALLED:=$(TOOLCHAIN_DIR)/stamp/.uclibc-utils_installed
|
||||
|
||||
UCLIBC_TARGET_ARCH:=$(shell echo $(ARCH) | sed -e s'/-.*//' \
|
||||
-e 's/i.86/i386/' \
|
||||
-e 's/sparc.*/sparc/' \
|
||||
-e 's/arm.*/arm/g' \
|
||||
-e 's/avr32.*/avr32/g' \
|
||||
-e 's/m68k.*/m68k/' \
|
||||
-e 's/ppc/powerpc/g' \
|
||||
-e 's/v850.*/v850/g' \
|
||||
-e 's/sh64/sh/' \
|
||||
-e 's/sh[234].*/sh/' \
|
||||
-e 's/mips.*/mips/' \
|
||||
-e 's/mipsel.*/mips/' \
|
||||
-e 's/cris.*/cris/' \
|
||||
)
|
||||
include ./common.mk
|
||||
|
||||
HOST_STAMP_BUILT:=$(HOST_BUILD_DIR)/.built
|
||||
HOST_STAMP_INSTALLED:=$(TOOLCHAIN_DIR)/stamp/.uclibc_installed
|
||||
|
||||
define Host/SetToolchainInfo
|
||||
$(SED) 's,^\(LIBC_TYPE\)=.*,\1=$(PKG_NAME),' $(TOOLCHAIN_DIR)/info.mk
|
||||
@ -48,64 +12,13 @@ define Host/SetToolchainInfo
|
||||
$(SED) 's,^\(LIBC_SO_VERSION\)=.*,\1=$(LIBC_SO_VERSION),' $(TOOLCHAIN_DIR)/info.mk
|
||||
endef
|
||||
|
||||
GEN_CONFIG=$(SCRIPT_DIR)/kconfig.pl -n \
|
||||
$(if $(wildcard $(CONFIG_DIR)/common),'+' $(CONFIG_DIR)/common) \
|
||||
$(if $(CONFIG_UCLIBC_ENABLE_DEBUG),$(if $(wildcard $(CONFIG_DIR)/debug),'+' $(CONFIG_DIR)/debug)) \
|
||||
$(CONFIG_DIR)/$(ARCH)$(strip \
|
||||
$(if $(wildcard $(CONFIG_DIR)/$(ARCH).$(BOARD)),.$(BOARD), \
|
||||
$(if $(CONFIG_HAS_SPE_FPU),$(if $(wildcard $(CONFIG_DIR)/$(ARCH).e500),.e500))))
|
||||
|
||||
define Host/Prepare
|
||||
$(call Host/Prepare/Default)
|
||||
$(if $(strip $(QUILT)), \
|
||||
cd $(HOST_BUILD_DIR); \
|
||||
if $(QUILT_CMD) next >/dev/null 2>&1; then \
|
||||
$(QUILT_CMD) push -a; \
|
||||
fi
|
||||
)
|
||||
ln -snf $(PKG_NAME)-$(PKG_VERSION) $(BUILD_DIR_TOOLCHAIN)/$(PKG_NAME)
|
||||
$(GEN_CONFIG) > $(HOST_BUILD_DIR)/.config
|
||||
$(SED) 's,^KERNEL_HEADERS=.*,KERNEL_HEADERS=\"$(BUILD_DIR_TOOLCHAIN)/linux-dev/include\",g' \
|
||||
-e 's,^.*UCLIBC_HAS_FPU.*,UCLIBC_HAS_FPU=$(if $(CONFIG_SOFT_FLOAT),n,y),g' \
|
||||
-e 's,^.*UCLIBC_HAS_SOFT_FLOAT.*,UCLIBC_HAS_SOFT_FLOAT=$(if $(CONFIG_SOFT_FLOAT),y,n),g' \
|
||||
-e 's,^.*UCLIBC_HAS_SHADOW.*,UCLIBC_HAS_SHADOW=$(if $(CONFIG_SHADOW_PASSWORDS),y,n),g' \
|
||||
-e 's,^.*UCLIBC_HAS_LOCALE.*,UCLIBC_HAS_LOCALE=$(if $(CONFIG_BUILD_NLS),y,n),g' \
|
||||
$(HOST_BUILD_DIR)/.config
|
||||
$(MAKE) -C $(HOST_BUILD_DIR) oldconfig KBUILD_HAVE_NLS= HOSTCFLAGS="-DKBUILD_NO_NLS"
|
||||
$(MAKE) -C $(HOST_BUILD_DIR)/extra/config conf KBUILD_HAVE_NLS= HOSTCFLAGS="-DKBUILD_NO_NLS"
|
||||
PATH='$(TARGET_PATH)' $(MAKE) -C $(HOST_BUILD_DIR) \
|
||||
PREFIX="$(BUILD_DIR_TOOLCHAIN)/$(LIBC)-dev/" \
|
||||
DEVEL_PREFIX=/ \
|
||||
RUNTIME_PREFIX="$(BUILD_DIR_TOOLCHAIN)/$(LIBC)-dev/" \
|
||||
HOSTCC="$(HOSTCC)" \
|
||||
CC="$(TARGET_CC)" \
|
||||
CPU_CFLAGS="$(TARGET_CFLAGS)" \
|
||||
ARCH="$(CONFIG_ARCH)" \
|
||||
pregen \
|
||||
install_headers
|
||||
endef
|
||||
|
||||
define Host/Configure
|
||||
endef
|
||||
|
||||
CPU_CFLAGS = \
|
||||
-funsigned-char -fno-builtin -fno-asm \
|
||||
--std=gnu99 -ffunction-sections -fdata-sections \
|
||||
$(TARGET_CFLAGS)
|
||||
|
||||
UCLIBC_MAKE = PATH='$(TOOLCHAIN_DIR)/initial/bin:$(TARGET_PATH)' $(MAKE) -C $(HOST_BUILD_DIR) \
|
||||
$(TARGET_CONFIGURE_OPTS) \
|
||||
DEVEL_PREFIX=/ \
|
||||
RUNTIME_PREFIX=/ \
|
||||
HOSTCC="$(HOSTCC)" \
|
||||
CPU_CFLAGS="$(CPU_CFLAGS)" \
|
||||
ARCH="$(CONFIG_ARCH)" \
|
||||
LIBGCC="$(subst libgcc.a,libgcc_initial.a,$(shell $(TARGET_CC) -print-libgcc-file-name))" \
|
||||
DOSTRIP=""
|
||||
|
||||
define Host/Compile
|
||||
$(SED) 's,^CROSS=.*,CROSS=$(TARGET_CROSS),g' $(HOST_BUILD_DIR)/Rules.mak
|
||||
$(UCLIBC_MAKE) $(TOOLCHAIN_JOBS) PREFIX= all
|
||||
endef
|
||||
|
||||
define Host/Install
|
||||
$(call Host/SetToolchainInfo)
|
||||
$(UCLIBC_MAKE) PREFIX="$(TOOLCHAIN_DIR)/" install_runtime install_dev
|
||||
$(CP) $(HOST_BUILD_DIR)/libc/libc_so.a $(TOOLCHAIN_DIR)/lib/
|
||||
$(CP) $(HOST_BUILD_DIR)/libpthread/*/libpthread_so.a $(TOOLCHAIN_DIR)/lib/
|
||||
@ -123,24 +36,4 @@ define Host/Compile
|
||||
$(TOOLCHAIN_DIR)/lib/libnsl*.so*
|
||||
endef
|
||||
|
||||
define Host/Install
|
||||
$(call Host/SetToolchainInfo)
|
||||
$(UCLIBC_MAKE) PREFIX= utils
|
||||
$(INSTALL_DIR) $(TOOLCHAIN_DIR)/bin
|
||||
$(INSTALL_BIN) \
|
||||
$(HOST_BUILD_DIR)/utils/ldd \
|
||||
$(TOOLCHAIN_DIR)/bin/
|
||||
$(INSTALL_DIR) $(TOOLCHAIN_DIR)/sbin
|
||||
$(INSTALL_BIN) \
|
||||
$(HOST_BUILD_DIR)/utils/ldconfig \
|
||||
$(TOOLCHAIN_DIR)/sbin/
|
||||
endef
|
||||
|
||||
define Host/Clean
|
||||
rm -rf \
|
||||
$(HOST_BUILD_DIR) \
|
||||
$(BUILD_DIR_TOOLCHAIN)/$(PKG_NAME) \
|
||||
$(BUILD_DIR_TOOLCHAIN)/$(LIBC)-dev
|
||||
endef
|
||||
|
||||
$(eval $(call HostBuild))
|
||||
|
||||
94
toolchain/uClibc/common.mk
Normal file
94
toolchain/uClibc/common.mk
Normal file
@ -0,0 +1,94 @@
|
||||
#
|
||||
# Copyright (C) 2006-2012 OpenWrt.org
|
||||
#
|
||||
# This is free software, licensed under the GNU General Public License v2.
|
||||
# See /LICENSE for more information.
|
||||
#
|
||||
include $(TOPDIR)/rules.mk
|
||||
include $(INCLUDE_DIR)/target.mk
|
||||
|
||||
PKG_NAME:=uClibc
|
||||
PKG_VERSION:=$(call qstrip,$(CONFIG_UCLIBC_VERSION))
|
||||
PKG_SOURCE_URL:=http://www.uclibc.org/downloads
|
||||
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
|
||||
LIBC_SO_VERSION:=$(PKG_VERSION)
|
||||
PATCH_DIR:=$(PATH_PREFIX)/patches-$(PKG_VERSION)
|
||||
CONFIG_DIR:=$(PATH_PREFIX)/config-$(PKG_VERSION)
|
||||
|
||||
PKG_MD5SUM_0.9.33.2 = a338aaffc56f0f5040e6d9fa8a12eda1
|
||||
PKG_MD5SUM=$(PKG_MD5SUM_$(PKG_VERSION))
|
||||
|
||||
HOST_BUILD_DIR:=$(BUILD_DIR_TOOLCHAIN)/$(PKG_NAME)-$(PKG_VERSION)
|
||||
|
||||
include $(INCLUDE_DIR)/toolchain-build.mk
|
||||
|
||||
UCLIBC_TARGET_ARCH:=$(shell echo $(ARCH) | sed -e s'/-.*//' \
|
||||
-e 's/i.86/i386/' \
|
||||
-e 's/sparc.*/sparc/' \
|
||||
-e 's/arm.*/arm/g' \
|
||||
-e 's/avr32.*/avr32/g' \
|
||||
-e 's/m68k.*/m68k/' \
|
||||
-e 's/ppc/powerpc/g' \
|
||||
-e 's/v850.*/v850/g' \
|
||||
-e 's/sh64/sh/' \
|
||||
-e 's/sh[234].*/sh/' \
|
||||
-e 's/mips.*/mips/' \
|
||||
-e 's/mipsel.*/mips/' \
|
||||
-e 's/cris.*/cris/' \
|
||||
)
|
||||
|
||||
GEN_CONFIG=$(SCRIPT_DIR)/kconfig.pl -n \
|
||||
$(if $(wildcard $(CONFIG_DIR)/common),'+' $(CONFIG_DIR)/common) \
|
||||
$(if $(CONFIG_UCLIBC_ENABLE_DEBUG),$(if $(wildcard $(CONFIG_DIR)/debug),'+' $(CONFIG_DIR)/debug)) \
|
||||
$(CONFIG_DIR)/$(ARCH)$(strip \
|
||||
$(if $(wildcard $(CONFIG_DIR)/$(ARCH).$(BOARD)),.$(BOARD), \
|
||||
$(if $(CONFIG_HAS_SPE_FPU),$(if $(wildcard $(CONFIG_DIR)/$(ARCH).e500),.e500))))
|
||||
|
||||
CPU_CFLAGS = \
|
||||
-funsigned-char -fno-builtin -fno-asm \
|
||||
--std=gnu99 -ffunction-sections -fdata-sections \
|
||||
$(TARGET_CFLAGS)
|
||||
|
||||
UCLIBC_MAKE = PATH='$(TOOLCHAIN_DIR)/initial/bin:$(TARGET_PATH)' $(MAKE) -C $(HOST_BUILD_DIR) \
|
||||
$(TARGET_CONFIGURE_OPTS) \
|
||||
DEVEL_PREFIX=/ \
|
||||
RUNTIME_PREFIX=/ \
|
||||
HOSTCC="$(HOSTCC)" \
|
||||
CPU_CFLAGS="$(CPU_CFLAGS)" \
|
||||
ARCH="$(CONFIG_ARCH)" \
|
||||
LIBGCC="$(subst libgcc.a,libgcc_initial.a,$(shell $(TARGET_CC) -print-libgcc-file-name))" \
|
||||
DOSTRIP=""
|
||||
|
||||
define Host/Prepare
|
||||
$(call Host/Prepare/Default)
|
||||
$(if $(strip $(QUILT)), \
|
||||
cd $(HOST_BUILD_DIR); \
|
||||
if $(QUILT_CMD) next >/dev/null 2>&1; then \
|
||||
$(QUILT_CMD) push -a; \
|
||||
fi
|
||||
)
|
||||
ln -snf $(PKG_NAME)-$(PKG_VERSION) $(BUILD_DIR_TOOLCHAIN)/$(PKG_NAME)
|
||||
endef
|
||||
|
||||
define Host/Configure
|
||||
$(GEN_CONFIG) > $(HOST_BUILD_DIR)/.config.new
|
||||
$(SED) 's,^KERNEL_HEADERS=.*,KERNEL_HEADERS=\"$(BUILD_DIR_TOOLCHAIN)/linux-dev/include\",g' \
|
||||
-e 's,^.*UCLIBC_HAS_FPU.*,UCLIBC_HAS_FPU=$(if $(CONFIG_SOFT_FLOAT),n,y),g' \
|
||||
-e 's,^.*UCLIBC_HAS_SOFT_FLOAT.*,UCLIBC_HAS_SOFT_FLOAT=$(if $(CONFIG_SOFT_FLOAT),y,n),g' \
|
||||
-e 's,^.*UCLIBC_HAS_SHADOW.*,UCLIBC_HAS_SHADOW=$(if $(CONFIG_SHADOW_PASSWORDS),y,n),g' \
|
||||
-e 's,^.*UCLIBC_HAS_LOCALE.*,UCLIBC_HAS_LOCALE=$(if $(CONFIG_BUILD_NLS),y,n),g' \
|
||||
$(HOST_BUILD_DIR)/.config.new
|
||||
cmp -s $(HOST_BUILD_DIR)/.config.new $(HOST_BUILD_DIR)/.config.last || { \
|
||||
cp $(HOST_BUILD_DIR)/.config.new $(HOST_BUILD_DIR)/.config && \
|
||||
$(MAKE) -C $(HOST_BUILD_DIR) oldconfig KBUILD_HAVE_NLS= HOSTCFLAGS="-DKBUILD_NO_NLS" && \
|
||||
$(MAKE) -C $(HOST_BUILD_DIR)/extra/config conf KBUILD_HAVE_NLS= HOSTCFLAGS="-DKBUILD_NO_NLS" && \
|
||||
cp $(HOST_BUILD_DIR)/.config.new $(HOST_BUILD_DIR)/.config.last; \
|
||||
}
|
||||
endef
|
||||
|
||||
define Host/Clean
|
||||
rm -rf \
|
||||
$(HOST_BUILD_DIR) \
|
||||
$(BUILD_DIR_TOOLCHAIN)/$(PKG_NAME) \
|
||||
$(BUILD_DIR_TOOLCHAIN)/$(LIBC)-dev
|
||||
endef
|
||||
26
toolchain/uClibc/headers/Makefile
Normal file
26
toolchain/uClibc/headers/Makefile
Normal file
@ -0,0 +1,26 @@
|
||||
PATH_PREFIX:=..
|
||||
|
||||
include ../common.mk
|
||||
|
||||
HOST_STAMP_BUILT:=$(HOST_BUILD_DIR)/.headers_built
|
||||
HOST_STAMP_INSTALLED:=$(TOOLCHAIN_DIR)/stamp/.uclibc_headers_installed
|
||||
|
||||
define Host/Compile
|
||||
|
||||
endef
|
||||
|
||||
define Host/Install
|
||||
PATH='$(TARGET_PATH)' $(MAKE) -C $(HOST_BUILD_DIR) \
|
||||
PREFIX="$(BUILD_DIR_TOOLCHAIN)/$(LIBC)-dev/" \
|
||||
DEVEL_PREFIX=/ \
|
||||
RUNTIME_PREFIX="$(BUILD_DIR_TOOLCHAIN)/$(LIBC)-dev/" \
|
||||
HOSTCC="$(HOSTCC)" \
|
||||
CC="$(TARGET_CC)" \
|
||||
CPU_CFLAGS="$(TARGET_CFLAGS)" \
|
||||
ARCH="$(CONFIG_ARCH)" \
|
||||
pregen \
|
||||
install_headers
|
||||
endef
|
||||
|
||||
$(eval $(call HostBuild))
|
||||
|
||||
24
toolchain/uClibc/utils/Makefile
Normal file
24
toolchain/uClibc/utils/Makefile
Normal file
@ -0,0 +1,24 @@
|
||||
PATH_PREFIX=..
|
||||
|
||||
include ../common.mk
|
||||
|
||||
HOST_STAMP_BUILT:=$(HOST_BUILD_DIR)/.utils_built
|
||||
HOST_STAMP_INSTALLED:=$(TOOLCHAIN_DIR)/stamp/.uclibc_utils_installed
|
||||
|
||||
define Host/Compile
|
||||
$(SED) 's,^CROSS=.*,CROSS=$(TARGET_CROSS),g' $(HOST_BUILD_DIR)/Rules.mak
|
||||
$(UCLIBC_MAKE) $(TOOLCHAIN_JOBS) PREFIX= utils
|
||||
endef
|
||||
|
||||
define Host/Install
|
||||
$(INSTALL_DIR) $(TOOLCHAIN_DIR)/bin
|
||||
$(INSTALL_BIN) \
|
||||
$(HOST_BUILD_DIR)/utils/ldd \
|
||||
$(TOOLCHAIN_DIR)/bin/
|
||||
$(INSTALL_DIR) $(TOOLCHAIN_DIR)/sbin
|
||||
$(INSTALL_BIN) \
|
||||
$(HOST_BUILD_DIR)/utils/ldconfig \
|
||||
$(TOOLCHAIN_DIR)/sbin/
|
||||
endef
|
||||
|
||||
$(eval $(call HostBuild))
|
||||
Loading…
Reference in New Issue
Block a user