summaryrefslogtreecommitdiffstats
path: root/rules
diff options
context:
space:
mode:
authorMarc Kleine-Budde <mkl@pengutronix.de>2008-10-13 09:35:51 +0000
committerMarc Kleine-Budde <mkl@pengutronix.de>2008-10-13 09:35:51 +0000
commite77eafca09ceed623337097f8d3886eaf7d7b000 (patch)
treed77add1b91accf1a2078d7ee54932197ba37c73d /rules
parent7948542df3f609c54ffb9d9c09906ebee632e27a (diff)
downloadOSELAS.Toolchain-e77eafca09ceed623337097f8d3886eaf7d7b000.tar.gz
OSELAS.Toolchain-e77eafca09ceed623337097f8d3886eaf7d7b000.tar.xz
* w32api.make, w32api.in, mingw-runtime.in, mingw-runtime.make:
updates default versions and filenames to recent new versions git-svn-id: https://svn.pengutronix.de/svn/oselas/toolchain/trunks/OSELAS.Toolchain-trunk@7755 f8d472c7-5700-0410-ac5a-87979cec3adf
Diffstat (limited to 'rules')
-rw-r--r--rules/mingw-runtime.in13
-rw-r--r--rules/mingw-runtime.make4
-rw-r--r--rules/w32api.in2
-rw-r--r--rules/w32api.make2
4 files changed, 13 insertions, 8 deletions
diff --git a/rules/mingw-runtime.in b/rules/mingw-runtime.in
index c1b2dff..e1375c0 100644
--- a/rules/mingw-runtime.in
+++ b/rules/mingw-runtime.in
@@ -2,18 +2,23 @@
menuconfig MINGW_RUNTIME
bool
- select CROSS_GCC_FIRST
select W32API
- select CROSS_GCC_SHARED
+ select GENERIC_SYSROOT
+
+ select CROSS_GCC_FIRST
+ select CROSS_GCC_ENABLE_CXA_ATEXIT
+ select CROSS_GCC_DISABLE_SJLJ_EXCEPTIONS
+ select CROSS_GCC_ENABLE_LIBSSP
+ select CROSS_GCC_ENABLE_SHARED
select CROSS_GCC_THREADS_WIN32
+
prompt "mingw-runtime "
config MINGW_RUNTIME_VERSION
depends on MINGW_RUNTIME
string
prompt "mingw-runtime version"
- default "3.14"
+ default "3.15.1"
help
Specify the mingw-runtime version here.
-
diff --git a/rules/mingw-runtime.make b/rules/mingw-runtime.make
index cd7ac76..f0b0299 100644
--- a/rules/mingw-runtime.make
+++ b/rules/mingw-runtime.make
@@ -18,7 +18,7 @@ PACKAGES-$(PTXCONF_MINGW_RUNTIME) += mingw-runtime
# Paths and names
#
MINGW_RUNTIME_VERSION := $(call remove_quotes,$(PTXCONF_MINGW_RUNTIME_VERSION))
-MINGW_RUNTIME := mingw-runtime-$(MINGW_RUNTIME_VERSION)
+MINGW_RUNTIME := mingwrt-$(MINGW_RUNTIME_VERSION)-mingw32
MINGW_RUNTIME_SUFFIX := tar.gz
MINGW_RUNTIME_URL := $(PTXCONF_SETUP_SFMIRROR)/mingw/$(MINGW_RUNTIME)-src.$(MINGW_RUNTIME_SUFFIX)
MINGW_RUNTIME_SOURCE := $(SRCDIR)/$(MINGW_RUNTIME)-src.$(MINGW_RUNTIME_SUFFIX)
@@ -54,7 +54,7 @@ MINGW_RUNTIME_ENV := $(CROSS_ENV)
MINGW_RUNTIME_AUTOCONF := \
--prefix=$(SYSROOT)/mingw \
--host=$(PTXCONF_GNU_TARGET) \
- --target=$(PTXCONF_GNU_TARGET) \
+ --target=$(PTXCONF_GNU_TARGET)
$(STATEDIR)/mingw-runtime.prepare:
@$(call targetinfo)
diff --git a/rules/w32api.in b/rules/w32api.in
index 2acfea3..3e9a7d9 100644
--- a/rules/w32api.in
+++ b/rules/w32api.in
@@ -9,6 +9,6 @@ config W32API_VERSION
depends on W32API
string
prompt "w32api version"
- default "3.11"
+ default "3.12"
help
Specify the w32api version here.
diff --git a/rules/w32api.make b/rules/w32api.make
index 6be35ba..329213a 100644
--- a/rules/w32api.make
+++ b/rules/w32api.make
@@ -18,7 +18,7 @@ PACKAGES-$(PTXCONF_W32API) += w32api
# Paths and names
#
W32API_VERSION := $(call remove_quotes,$(PTXCONF_W32API_VERSION))
-W32API := w32api-$(W32API_VERSION)
+W32API := w32api-$(W32API_VERSION)-mingw32
W32API_SUFFIX := tar.gz
W32API_URL := $(PTXCONF_SETUP_SFMIRROR)/mingw/$(W32API)-src.$(W32API_SUFFIX)
W32API_SOURCE := $(SRCDIR)/$(W32API)-src.$(W32API_SUFFIX)