Merge pull request #801 from stilor/regressions

Regressions

7 files changed, 16 insertions, 5 deletions

diff --git a/config/libc/glibc.in b/config/libc/glibc.in
index 363ab34..f679130 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/config/libc/mingw-w64.in b/config/libc/mingw-w64.in
index 769c976..34f8dbc 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/glibc/package.desc b/packages/glibc/package.desc
index 13e2233..bef0c1d 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 3dae8f3..4596f4c 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'
diff --git a/packages/mingw-w64/package.desc b/packages/mingw-w64/package.desc
index bbe507a..1b6086c 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 295b313..21afb29 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
diff --git a/scripts/functions b/scripts/functions
index 6ce53b0..ed8eb67 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