diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | Kconfig | 2 | ||||
| -rw-r--r-- | rules/cross-gcc-first.in | 34 | ||||
| -rw-r--r-- | rules/cross-gcc-first.make | 2 | ||||
| -rw-r--r-- | rules/cross-gcc-second.in | 5 | ||||
| -rw-r--r-- | rules/host-gmp.in | 2 | ||||
| -rw-r--r-- | rules/host-gmp.make | 106 | ||||
| -rw-r--r-- | rules/host-mpfr.in | 3 | ||||
| -rw-r--r-- | rules/host-mpfr.make | 106 |
9 files changed, 225 insertions, 39 deletions
@@ -38,3 +38,7 @@ 2007-03-12 Marc Kleine-Budde <mkl@pengutronix.de> * rules/newlib.{in.make}: added newlib (tnx to sha) + +2007-03-12 Marc Kleine-Budde <mkl@pengutronix.de> + + * rules/host-{mpfr,gmp}.{make,in}: added for gcc-4.3 support @@ -39,6 +39,8 @@ source "workspace/rules/kernel-headers.in" source "workspace/rules/cross-gcc.in" source "workspace/rules/cross-gdb.in" source "workspace/rules/cross-toolchain.in" +source "workspace/rules/host-gmp.in" +source "workspace/rules/host-mpfr.in" source "workspace/rules/host-dejagnu.in" comment " " diff --git a/rules/cross-gcc-first.in b/rules/cross-gcc-first.in deleted file mode 100644 index 5733f62..0000000 --- a/rules/cross-gcc-first.in +++ /dev/null @@ -1,34 +0,0 @@ -# config for cross-gcc-first - -menuconfig CROSS_GCC_FIRST - bool - select CROSS_BINUTILS - select LIBC_HEADERS - prompt "gcc " - - -config CROSS_GCC_FIRST_VERSION - depends on CROSS_GCC_FIRST - string - prompt "gcc version" - default "4.1.2" - help - Specify the version of gcc here. - -config CROSS_GCC_FIRST_SERIES - depends on CROSS_GCC_FIRST - string - prompt "gcc patch series file" - -config CROSS_GCC_LANG - depends on CROSS_GCC_FIRST - string - prompt "languages" - default "c,c++" - -config CROSS_GCC_EXTRA_CONFIG - depends on CROSS_GCC_FIRST - string - prompt "extra configure options" - help - Add these extra options to the gcc configure script. diff --git a/rules/cross-gcc-first.make b/rules/cross-gcc-first.make index cd0de40..3a5a484 100644 --- a/rules/cross-gcc-first.make +++ b/rules/cross-gcc-first.make @@ -68,6 +68,8 @@ CROSS_GCC_AUTOCONF_COMMON := \ --host=$(GNU_HOST) \ --target=$(PTXCONF_GNU_TARGET) \ --with-sysroot=$(SYSROOT) \ + --with-gmp=$(PTX_PREFIX_HOST) \ + --with-mpfr=$(PTX_PREFIX_HOST) \ $(PTXCONF_CROSS_GCC_EXTRA_CONFIG) \ $(PTXCONF_CROSS_GCC_EXTRA_CONFIG_LIBC) \ \ diff --git a/rules/cross-gcc-second.in b/rules/cross-gcc-second.in deleted file mode 100644 index e46a074..0000000 --- a/rules/cross-gcc-second.in +++ /dev/null @@ -1,5 +0,0 @@ -# config for cross-gcc-second - -config CROSS_GCC_SECOND - bool - select LIBC diff --git a/rules/host-gmp.in b/rules/host-gmp.in new file mode 100644 index 0000000..d81ff47 --- /dev/null +++ b/rules/host-gmp.in @@ -0,0 +1,2 @@ +config HOST_GMP + bool diff --git a/rules/host-gmp.make b/rules/host-gmp.make new file mode 100644 index 0000000..db7e68d --- /dev/null +++ b/rules/host-gmp.make @@ -0,0 +1,106 @@ +# -*-makefile-*- +# $Id$ +# +# Copyright (C) 2007 by Marc Kleine-Budde <mkl@pengutronix.de> +# +# See CREDITS for details about who has contributed to this project. +# +# For further information about the PTXdist project and license conditions +# see the README file. +# + +# +# We provide this package +# +HOST_PACKAGES-$(PTXCONF_HOST_GMP) += host-gmp + +# +# Paths and names +# +HOST_GMP_VERSION := 4.2.1 +HOST_GMP := gmp-$(HOST_GMP_VERSION) +HOST_GMP_SUFFIX := tar.bz2 +HOST_GMP_URL := $(PTXCONF_SETUP_GNUMIRROR)/gmp/$(HOST_GMP).$(HOST_GMP_SUFFIX) +HOST_GMP_SOURCE := $(SRCDIR)/$(HOST_GMP).$(HOST_GMP_SUFFIX) +HOST_GMP_DIR := $(HOST_BUILDDIR)/$(HOST_GMP) + +# ---------------------------------------------------------------------------- +# Get +# ---------------------------------------------------------------------------- + +host-gmp_get: $(STATEDIR)/host-gmp.get + +$(STATEDIR)/host-gmp.get: $(host-gmp_get_deps_default) + @$(call targetinfo, $@) + @$(call touch, $@) + +$(HOST_GMP_SOURCE): + @$(call targetinfo, $@) + @$(call get, HOST_GMP) + +# ---------------------------------------------------------------------------- +# Extract +# ---------------------------------------------------------------------------- + +host-gmp_extract: $(STATEDIR)/host-gmp.extract + +$(STATEDIR)/host-gmp.extract: $(host-gmp_extract_deps_default) + @$(call targetinfo, $@) + @$(call clean, $(HOST_GMP_DIR)) + @$(call extract, HOST_GMP, $(HOST_BUILDDIR)) + @$(call patchin, HOST_GMP, $(HOST_GMP_DIR)) + @$(call touch, $@) + +# ---------------------------------------------------------------------------- +# Prepare +# ---------------------------------------------------------------------------- + +host-gmp_prepare: $(STATEDIR)/host-gmp.prepare + +HOST_GMP_PATH := PATH=$(HOST_PATH) +HOST_GMP_ENV := $(HOST_ENV) + +# +# autoconf +# +HOST_GMP_AUTOCONF := $(HOST_AUTOCONF) + +$(STATEDIR)/host-gmp.prepare: $(host-gmp_prepare_deps_default) + @$(call targetinfo, $@) + @$(call clean, $(HOST_GMP_DIR)/config.cache) + cd $(HOST_GMP_DIR) && \ + $(HOST_GMP_PATH) $(HOST_GMP_ENV) \ + ./configure $(HOST_GMP_AUTOCONF) + @$(call touch, $@) + +# ---------------------------------------------------------------------------- +# Compile +# ---------------------------------------------------------------------------- + +host-gmp_compile: $(STATEDIR)/host-gmp.compile + +$(STATEDIR)/host-gmp.compile: $(host-gmp_compile_deps_default) + @$(call targetinfo, $@) + cd $(HOST_GMP_DIR) && $(HOST_GMP_PATH) $(MAKE) $(PARALLELMFLAGS) + @$(call touch, $@) + +# ---------------------------------------------------------------------------- +# Install +# ---------------------------------------------------------------------------- + +host-gmp_install: $(STATEDIR)/host-gmp.install + +$(STATEDIR)/host-gmp.install: $(host-gmp_install_deps_default) + @$(call targetinfo, $@) + @$(call install, HOST_GMP,,h) + @$(call touch, $@) + +# ---------------------------------------------------------------------------- +# Clean +# ---------------------------------------------------------------------------- + +host-gmp_clean: + rm -rf $(STATEDIR)/host-gmp.* + rm -rf $(HOST_GMP_DIR) + +# vim: syntax=make diff --git a/rules/host-mpfr.in b/rules/host-mpfr.in new file mode 100644 index 0000000..a27707d --- /dev/null +++ b/rules/host-mpfr.in @@ -0,0 +1,3 @@ +config HOST_MPFR + select HOST_GMP + bool diff --git a/rules/host-mpfr.make b/rules/host-mpfr.make new file mode 100644 index 0000000..7a35e6e --- /dev/null +++ b/rules/host-mpfr.make @@ -0,0 +1,106 @@ +# -*-makefile-*- +# $Id$ +# +# Copyright (C) 2007 by Marc Kleine-Budde <mkl@pengutronix.de> +# +# See CREDITS for details about who has contributed to this project. +# +# For further information about the PTXdist project and license conditions +# see the README file. +# + +# +# We provide this package +# +HOST_PACKAGES-$(PTXCONF_HOST_MPFR) += host-mpfr + +# +# Paths and names +# +HOST_MPFR_VERSION := 2.2.1 +HOST_MPFR := mpfr-$(HOST_MPFR_VERSION) +HOST_MPFR_SUFFIX := tar.bz2 +HOST_MPFR_URL := http://www.mpfr.org/mpfr-current/$(HOST_MPFR).$(HOST_MPFR_SUFFIX) +HOST_MPFR_SOURCE := $(SRCDIR)/$(HOST_MPFR).$(HOST_MPFR_SUFFIX) +HOST_MPFR_DIR := $(HOST_BUILDDIR)/$(HOST_MPFR) + +# ---------------------------------------------------------------------------- +# Get +# ---------------------------------------------------------------------------- + +host-mpfr_get: $(STATEDIR)/host-mpfr.get + +$(STATEDIR)/host-mpfr.get: $(host-mpfr_get_deps_default) + @$(call targetinfo, $@) + @$(call touch, $@) + +$(HOST_MPFR_SOURCE): + @$(call targetinfo, $@) + @$(call get, HOST_MPFR) + +# ---------------------------------------------------------------------------- +# Extract +# ---------------------------------------------------------------------------- + +host-mpfr_extract: $(STATEDIR)/host-mpfr.extract + +$(STATEDIR)/host-mpfr.extract: $(host-mpfr_extract_deps_default) + @$(call targetinfo, $@) + @$(call clean, $(HOST_MPFR_DIR)) + @$(call extract, HOST_MPFR, $(HOST_BUILDDIR)) + @$(call patchin, HOST_MPFR, $(HOST_MPFR_DIR)) + @$(call touch, $@) + +# ---------------------------------------------------------------------------- +# Prepare +# ---------------------------------------------------------------------------- + +host-mpfr_prepare: $(STATEDIR)/host-mpfr.prepare + +HOST_MPFR_PATH := PATH=$(HOST_PATH) +HOST_MPFR_ENV := $(HOST_ENV) + +# +# autoconf +# +HOST_MPFR_AUTOCONF := $(HOST_AUTOCONF) + +$(STATEDIR)/host-mpfr.prepare: $(host-mpfr_prepare_deps_default) + @$(call targetinfo, $@) + @$(call clean, $(HOST_MPFR_DIR)/config.cache) + cd $(HOST_MPFR_DIR) && \ + $(HOST_MPFR_PATH) $(HOST_MPFR_ENV) \ + ./configure $(HOST_MPFR_AUTOCONF) + @$(call touch, $@) + +# ---------------------------------------------------------------------------- +# Compile +# ---------------------------------------------------------------------------- + +host-mpfr_compile: $(STATEDIR)/host-mpfr.compile + +$(STATEDIR)/host-mpfr.compile: $(host-mpfr_compile_deps_default) + @$(call targetinfo, $@) + cd $(HOST_MPFR_DIR) && $(HOST_MPFR_PATH) $(MAKE) $(PARALLELMFLAGS) + @$(call touch, $@) + +# ---------------------------------------------------------------------------- +# Install +# ---------------------------------------------------------------------------- + +host-mpfr_install: $(STATEDIR)/host-mpfr.install + +$(STATEDIR)/host-mpfr.install: $(host-mpfr_install_deps_default) + @$(call targetinfo, $@) + @$(call install, HOST_MPFR,,h) + @$(call touch, $@) + +# ---------------------------------------------------------------------------- +# Clean +# ---------------------------------------------------------------------------- + +host-mpfr_clean: + rm -rf $(STATEDIR)/host-mpfr.* + rm -rf $(HOST_MPFR_DIR) + +# vim: syntax=make |