KumiSystems/openwrtv3
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

cleanup toolchain version handling

Browse source 
SVN-Revision: 25148
This commit is contained in:
Imre Kaloz 2011-01-27 13:55:00 +00:00
parent a844918ead
commit 50be0201f1
5 changed files with 7 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
toolchain/eglibc/Config.in
View file

@ -22,11 +22,11 @@ choice
config EGLIBC_VERSION_2_11 config EGLIBC_VERSION_2_11
bool "eglibc 2.11" bool "eglibc 2.11"
depends GCC_VERSION_4_3 || GCC_VERSION_4_4 || GCC_VERSION_4_5 depends !GCC_VERSION_LLVM
config EGLIBC_VERSION_2_12 config EGLIBC_VERSION_2_12
bool "eglibc 2.12" bool "eglibc 2.12"
depends GCC_VERSION_4_3 || GCC_VERSION_4_4 || GCC_VERSION_4_5 depends !GCC_VERSION_LLVM
config EGLIBC_VERSION_TRUNK config EGLIBC_VERSION_TRUNK
bool "eglibc trunk" bool "eglibc trunk"

2
toolchain/gcc/Config.in
View file

@ -78,7 +78,7 @@ config INSTALL_LIBSTDCPP
config INSTALL_LIBGCJ config INSTALL_LIBGCJ
bool bool
depends on !GCC_VERSION_4_2 depends on !GCC_VERSION_LLVM
prompt "Build/install java compiler and GNU classpath ?" if TOOLCHAINOPTS prompt "Build/install java compiler and GNU classpath ?" if TOOLCHAINOPTS
default n default n
help help

11
toolchain/gcc/Config.version
View file

@ -9,17 +9,6 @@ config GCC_VERSION
default "llvm" if GCC_VERSION_LLVM default "llvm" if GCC_VERSION_LLVM
default "4.5.1+l" default "4.5.1+l"
config GCC_VERSION_4
bool
default y if GCC_VERSION_4_2
default y if GCC_VERSION_4_3
default y if GCC_VERSION_4_4
default y if GCC_VERSION_4_5
config GCC_VERSION_4_2
bool
default y if GCC_VERSION_LLVM
config GCC_VERSION_4_3 config GCC_VERSION_4_3
bool bool
default y if GCC_VERSION_4_3_3_CS default y if GCC_VERSION_4_3_3_CS

8
toolchain/gcc/common.mk
View file

@ -48,12 +48,6 @@ else
PKG_SOURCE_URL:=@GNU/gcc/gcc-$(PKG_VERSION) PKG_SOURCE_URL:=@GNU/gcc/gcc-$(PKG_VERSION)
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
ifeq ($(PKG_VERSION),4.1.2)
PKG_MD5SUM:=a4a3eb15c96030906d8494959eeda23c
endif
ifeq ($(PKG_VERSION),4.2.4)
PKG_MD5SUM:=d79f553e7916ea21c556329eacfeaa16
endif
ifeq ($(PKG_VERSION),4.3.3) ifeq ($(PKG_VERSION),4.3.3)
PKG_MD5SUM:=cc3c5565fdb9ab87a05ddb106ba0bd1f PKG_MD5SUM:=cc3c5565fdb9ab87a05ddb106ba0bd1f
endif endif
@ -126,7 +120,7 @@ ifneq ($(CONFIG_GCC_VERSION_4_4)$(CONFIG_GCC_VERSION_4_5),)
endif endif
endif endif
ifneq ($(CONFIG_GCC_VERSION_4_3)$(CONFIG_GCC_VERSION_4_4)$(CONFIG_GCC_VERSION_4_5),) ifeq ($(CONFIG_GCC_LLVM),)
GCC_BUILD_TARGET_LIBGCC:=y GCC_BUILD_TARGET_LIBGCC:=y
GCC_CONFIGURE+= \ GCC_CONFIGURE+= \
--with-gmp=$(TOPDIR)/staging_dir/host \ --with-gmp=$(TOPDIR)/staging_dir/host \

6
tools/Makefile
View file

@ -10,8 +10,8 @@ curdir:=tools
# subdirectories to descend into # subdirectories to descend into
tools-y := tools-y :=
ifeq ($(CONFIG_EXTERNAL_TOOLCHAIN),) ifeq ($(CONFIG_EXTERNAL_TOOLCHAIN)$(CONFIG_GCC_LLVM),)
tools-$(CONFIG_GCC_VERSION_4_3)$(CONFIG_GCC_VERSION_4_4)$(CONFIG_GCC_VERSION_4_5) += gmp mpfr tools-y += gmp mpfr
tools-$(CONFIG_GCC_VERSION_4_5) += mpc libelf tools-$(CONFIG_GCC_VERSION_4_5) += mpc libelf
endif endif
tools-y += m4 libtool autoconf automake flex bison pkg-config sed mklibs tools-y += m4 libtool autoconf automake flex bison pkg-config sed mklibs
@ -107,5 +107,5 @@ $(curdir)//compile = $(STAGING_DIR)/.prepared $(STAGING_DIR_HOST)/.prepared $($(
$(curdir)/ := .config prereq $(curdir)/ := .config prereq
$(curdir)//install = $(1)/compile $(curdir)//install = $(1)/compile
$(eval $(call stampfile,$(curdir),tools,install,,CONFIG_CCACHE CONFIG_powerpc CONFIG_GCC_VERSION_4_3 CONFIG_GCC_USE_GRAPHITE CONFIG_TARGET_orion_generic)) $(eval $(call stampfile,$(curdir),tools,install,,CONFIG_CCACHE CONFIG_powerpc CONFIG_GCC_VERSION_4_5 CONFIG_GCC_USE_GRAPHITE CONFIG_TARGET_orion_generic))
$(eval $(call subdir,$(curdir))) $(eval $(call subdir,$(curdir)))