summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--config/libc/mingw.in5
-rw-r--r--scripts/build/libc/mingw.sh36
2 files changed, 28 insertions, 13 deletions
diff --git a/config/libc/mingw.in b/config/libc/mingw.in
index 431af51..4e30421 100644
--- a/config/libc/mingw.in
+++ b/config/libc/mingw.in
@@ -17,6 +17,10 @@ choice
# Don't remove next line
# CT_INSERT_VERSION_BELOW
+config WINAPI_V_DEVEL
+ bool
+ prompt "devel"
+
config WINAPI_V_4_0_2
bool
prompt "4.0.2"
@@ -56,6 +60,7 @@ config WINAPI_VERSION
prompt "Windows API version" if WINAPI_V_select
# Don't remove next line
# CT_INSERT_VERSION_STRING_BELOW
+ default "devel" if WINAPI_V_DEVEL
default "4.0.2" if WINAPI_V_4_0_2
default "4.0.1" if WINAPI_V_4_0_1
default "4.0.0" if WINAPI_V_4_0_0
diff --git a/scripts/build/libc/mingw.sh b/scripts/build/libc/mingw.sh
index 94b7705..23f31d1 100644
--- a/scripts/build/libc/mingw.sh
+++ b/scripts/build/libc/mingw.sh
@@ -1,15 +1,25 @@
# Copyright 2012 Yann Diorcet
# Licensed under the GPL v2. See COPYING in the root of this package
-do_libc_get() {
- CT_GetFile "mingw-w64-v${CT_WINAPI_VERSION}" \
- http://downloads.sourceforge.net/sourceforge/mingw-w64
+CT_WINAPI_VERSION_DOWNLOADED=
+
+do_libc_get() {
+ CT_DoStep INFO "Fetching mingw-w64 source for ${CT_WINAPI_VERSION}"
+ if [ "${CT_WINAPI_VERSION}" = "devel" ]; then
+ CT_GetGit "mingw-w64" "ref=HEAD" "git://git.code.sf.net/p/mingw-w64/mingw-w64" CT_WINAPI_VERSION_DOWNLOADED
+ CT_DoLog EXTRA "Fetched as ${CT_WINAPI_VERSION_DOWNLOADED}"
+ else
+ CT_GetFile "mingw-w64-v${CT_WINAPI_VERSION}" \
+ http://downloads.sourceforge.net/sourceforge/mingw-w64
+ CT_WINAPI_VERSION_DOWNLOADED=v${CT_WINAPI_VERSION}
+ fi
+ CT_EndStep
}
do_libc_extract() {
- CT_Extract "mingw-w64-v${CT_WINAPI_VERSION}"
- CT_Pushd "${CT_SRC_DIR}/mingw-w64-v${CT_WINAPI_VERSION}/"
- CT_Patch nochdir mingw-w64 "${CT_WINAPI_VERSION}"
+ CT_Extract "mingw-w64-${CT_WINAPI_VERSION_DOWNLOADED}"
+ CT_Pushd "${CT_SRC_DIR}/mingw-w64-${CT_WINAPI_VERSION_DOWNLOADED}/"
+ CT_Patch nochdir mingw-w64 "${CT_WINAPI_VERSION_DOWNLOADED}"
CT_Popd
}
@@ -42,7 +52,7 @@ do_libc_start_files() {
do_set_mingw_install_prefix
CT_DoExecLog CFG \
- "${CT_SRC_DIR}/mingw-w64-v${CT_WINAPI_VERSION}/mingw-w64-headers/configure" \
+ "${CT_SRC_DIR}/mingw-w64-${CT_WINAPI_VERSION_DOWNLOADED}/mingw-w64-headers/configure" \
--build=${CT_BUILD} \
--host=${CT_TARGET} \
--prefix=${MINGW_INSTALL_PREFIX} \
@@ -87,12 +97,12 @@ do_libc() {
CT_mkdir_pushd "${CT_BUILD_DIR}/build-mingw-w64-crt"
do_set_mingw_install_prefix
- CT_DoExecLog CFG \
- "${CT_SRC_DIR}/mingw-w64-v${CT_WINAPI_VERSION}/mingw-w64-crt/configure" \
- --with-sysroot=${CT_SYSROOT_DIR} \
- --prefix=${MINGW_INSTALL_PREFIX} \
- --build=${CT_BUILD} \
- --host=${CT_TARGET} \
+ CT_DoExecLog CFG \
+ "${CT_SRC_DIR}/mingw-w64-${CT_WINAPI_VERSION_DOWNLOADED}/mingw-w64-crt/configure" \
+ --with-sysroot=${CT_SYSROOT_DIR} \
+ --prefix=${MINGW_INSTALL_PREFIX} \
+ --build=${CT_BUILD} \
+ --host=${CT_TARGET} \
CT_DoLog EXTRA "Building mingw-w64-crt"
CT_DoExecLog ALL make ${JOBSFLAGS}