From e6bc8dfe865668f16ea2c9b0991f1e7517f34250 Mon Sep 17 00:00:00 2001
From: Alexey Neyman <stilor@att.net>
Date: Wed, 16 Aug 2017 09:30:36 -0700
Subject: [PATCH 1/3] Fix DoLog -> DoExecLog

Fixes #788.

Signed-off-by: Alexey Neyman <stilor@att.net>
---
 scripts/functions | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/functions b/scripts/functions
index 5527fa21..1f1bf219 100644
--- a/scripts/functions
+++ b/scripts/functions
@@ -1961,7 +1961,7 @@ CT_DoExtractPatch()
         local overlay
 
         if [ ! -d "${CT_BUILD_DIR}/overlay" ]; then
-            CT_DoLog ALL mkdir -p "${CT_BUILD_DIR}/overlay"
+            CT_DoExecLog ALL mkdir -p "${CT_BUILD_DIR}/overlay"
             overlay="${CT_OVERLAY_LOCATION}/${CT_ARCH}_${CT_OVERLAY_NAME:-overlay}"
             ext=`CT_GetFileExtension "${overlay}"`
             if [ ! -r "${overlay}${ext}" ]; then

From 3d470580cedeffb86d33832ffffc7ad010978b4f Mon Sep 17 00:00:00 2001
From: Alexey Neyman <stilor@att.net>
Date: Wed, 16 Aug 2017 10:47:52 -0700
Subject: [PATCH 2/3] Fix version check in mingw-w64

Fixes #782.

Signed-off-by: Alexey Neyman <stilor@att.net>
---
 config/libc/mingw-w64.in        | 4 ++++
 packages/mingw-w64/package.desc | 1 +
 scripts/build/libc/mingw-w64.sh | 6 +++---
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/config/libc/mingw-w64.in b/config/libc/mingw-w64.in
index 769c976f..34f8dbc8 100644
--- a/config/libc/mingw-w64.in
+++ b/config/libc/mingw-w64.in
@@ -10,6 +10,10 @@
 
 source "config/versions/mingw-w64.in"
 
+config MINGW_W64_REQUIRES_W64_VENDOR
+	bool
+	default y if MINGW_W64_V4_or_later
+
 config THREADS
     default "win32"  if THREADS_NATIVE
     default "posix"  if THREADS_POSIX
diff --git a/packages/mingw-w64/package.desc b/packages/mingw-w64/package.desc
index bbe507ac..1b6086cc 100644
--- a/packages/mingw-w64/package.desc
+++ b/packages/mingw-w64/package.desc
@@ -1,2 +1,3 @@
 repository='git https://git.code.sf.net/p/mingw-w64/mingw-w64'
 mirrors='http://downloads.sourceforge.net/sourceforge/mingw-w64 https://downloads.sourceforge.net/project/mingw-w64/mingw-w64/mingw-w64-release/'
+milestones='v4'
diff --git a/scripts/build/libc/mingw-w64.sh b/scripts/build/libc/mingw-w64.sh
index 295b313b..21afb29d 100644
--- a/scripts/build/libc/mingw-w64.sh
+++ b/scripts/build/libc/mingw-w64.sh
@@ -63,10 +63,10 @@ do_libc_start_files() {
 
 do_check_mingw_vendor_tuple()
 {
-    if [ "${CT_MINGW_W64_VERSION%%.*}" -ge 4 ]; then
+    if [ "${CT_MINGW_W64_REQUIRES_W64_VENDOR}" = "y" ]; then
        CT_DoStep INFO "Checking configured vendor tuple"
-       if [ ${CT_TARGET_VENDOR} == w64 ]; then
-           CT_DoLog EXTRA "The tuple is set to '${CT_TARGET_VENDOR}', as recommended by mingw-64 developers."
+       if [ ${CT_TARGET_VENDOR} = "w64" ]; then
+           CT_DoLog DEBUG "The tuple is set to '${CT_TARGET_VENDOR}', as recommended by mingw-64 developers."
        else
            CT_DoLog WARN "The tuple vendor is '${CT_TARGET_VENDOR}', not equal to 'w64' and might break the toolchain!"
        fi

From 9b076a39abf04442245738bf434cc35a85f502ca Mon Sep 17 00:00:00 2001
From: Alexey Neyman <stilor@att.net>
Date: Wed, 16 Aug 2017 14:26:31 -0700
Subject: [PATCH 3/3] Record glibc 2.24+ dependency

... on kernel headers of 3.2 and newer.

Fixes #794.

Signed-off-by: Alexey Neyman <stilor@att.net>
---
 config/libc/glibc.in        | 5 +++++
 packages/glibc/package.desc | 2 +-
 packages/linux/package.desc | 1 +
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/config/libc/glibc.in b/config/libc/glibc.in
index 363ab348..f6791301 100644
--- a/config/libc/glibc.in
+++ b/config/libc/glibc.in
@@ -21,6 +21,11 @@ if GLIBC_USE_PORTS_EXTERNAL
 source "config/versions/glibc-ports.in"
 endif
 
+# Glibc has some dependencies on the kernel headers:
+config GLIBC_DEP_KERNEL_HEADERS_VERSION
+	def_bool y
+	select LINUX_REQUIRE_3_2_or_later if GLIBC_2_24_or_later
+
 config THREADS
     default "nptl"
 
diff --git a/packages/glibc/package.desc b/packages/glibc/package.desc
index 13e2233c..bef0c1d7 100644
--- a/packages/glibc/package.desc
+++ b/packages/glibc/package.desc
@@ -1,4 +1,4 @@
 origin='GNU'
 repository='git git://sourceware.org/git/glibc.git'
 mirrors='$(CT_Mirrors GNU glibc) $(CT_Mirrors sourceware glibc/releases)'
-milestones='2.17 2.20 2.23'
+milestones='2.17 2.20 2.23 2.24'
diff --git a/packages/linux/package.desc b/packages/linux/package.desc
index 3dae8f3b..4596f4c4 100644
--- a/packages/linux/package.desc
+++ b/packages/linux/package.desc
@@ -1,3 +1,4 @@
 repository='git git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git'
 mirrors='$(CT_Mirrors kernel.org linux ${CT_LINUX_VERSION})'
 relevantpattern='2.*.*|. *.*|.'
+milestones='3.2'