From f0b0c6666fd059e67b63669132648b07a43e0489 Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN\"" <yann.morin.1998@anciens.enib.fr>
Date: Mon, 1 Aug 2011 00:16:12 +0200
Subject: libc/mingw: fix mingw source dirs

Someof the mingw32 source tarballs have an appended '-src' after the
version.

Since changeset #6e1412ba8da9 (scripts/functions: force extract folder
to archive basename), it means mingw tarballs get extracted in a directory
ending with '-src'.

Fix that.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>

diff --git a/scripts/build/kernel/mingw32.sh b/scripts/build/kernel/mingw32.sh
index 47bbe2f..24ab6c5 100644
--- a/scripts/build/kernel/mingw32.sh
+++ b/scripts/build/kernel/mingw32.sh
@@ -20,7 +20,7 @@ do_kernel_headers() {
     CT_DoStep INFO "Installing kernel headers"
 
     mkdir -p "${CT_HEADERS_DIR}"
-    cp -r ${CT_SRC_DIR}/w32api-${CT_W32API_VERSION}-mingw32/include/* \
+    cp -r ${CT_SRC_DIR}/w32api-${CT_W32API_VERSION}-mingw32-src/include/*   \
           ${CT_HEADERS_DIR}
 
     CT_EndStep
diff --git a/scripts/build/libc/mingw.sh b/scripts/build/libc/mingw.sh
index 33a6899..fcd7545 100644
--- a/scripts/build/libc/mingw.sh
+++ b/scripts/build/libc/mingw.sh
@@ -29,7 +29,7 @@ do_libc_extract() {
     fi
     if [ -n "${CT_MINGW_GNURX}" ]; then
         CT_Extract "mingw-libgnurx-${CT_MINGW_GNURX_VERSION}-src"
-        CT_Patch "mingw-libgnurx" "${CT_MINGW_GNURX_VERSION}"
+        CT_Patch "mingw-libgnurx" "${CT_MINGW_GNURX_VERSION}-src"
     fi
 }
 
@@ -42,7 +42,7 @@ do_libc_start_files() {
 
     CT_DoLog EXTRA "Installing MinGW Runtime headers"
     mkdir -p "${CT_HEADERS_DIR}"
-    cp -r ${CT_SRC_DIR}/mingwrt-${CT_MINGWRT_VERSION}-mingw32/include/* \
+    cp -r ${CT_SRC_DIR}/mingwrt-${CT_MINGWRT_VERSION}-mingw32-src/include/* \
           ${CT_HEADERS_DIR}
 
     # It seems mingw is strangely set up to look into /mingw instead of
@@ -61,12 +61,12 @@ do_libc() {
     mkdir -p "${CT_BUILD_DIR}/build-w32api"
     cd "${CT_BUILD_DIR}/build-w32api"
 
-    CT_DoExecLog CFG                                              \
-    CFLAGS="-I${CT_HEADERS_DIR}"                                  \
-    LDFLAGS="-L${CT_SYSROOT_DIR}/lib"                             \
-    "${CT_SRC_DIR}/w32api-${CT_W32API_VERSION}-mingw32/configure" \
-        --prefix=${CT_SYSROOT_DIR}                                \
-        --includedir=${CT_HEADERS_DIR}                            \
+    CT_DoExecLog CFG                                                  \
+    CFLAGS="-I${CT_HEADERS_DIR}"                                      \
+    LDFLAGS="-L${CT_SYSROOT_DIR}/lib"                                 \
+    "${CT_SRC_DIR}/w32api-${CT_W32API_VERSION}-mingw32-src/configure" \
+        --prefix=${CT_SYSROOT_DIR}                                    \
+        --includedir=${CT_HEADERS_DIR}                                \
         --host=${CT_TARGET}
 
     CT_DoLog EXTRA "Building W32-API"
@@ -80,12 +80,12 @@ do_libc() {
     mkdir -p "${CT_BUILD_DIR}/build-mingwrt"
     cd "${CT_BUILD_DIR}/build-mingwrt"
 
-    CT_DoExecLog CFG                                                \
-    CFLAGS="-I${CT_HEADERS_DIR}"                                    \
-    LDFLAGS="-L${CT_SYSROOT_DIR}/lib"                               \
-    "${CT_SRC_DIR}/mingwrt-${CT_MINGWRT_VERSION}-mingw32/configure" \
-        --prefix=${CT_SYSROOT_DIR}/                                 \
-        --includedir=${CT_HEADERS_DIR}                              \
+    CT_DoExecLog CFG                                                    \
+    CFLAGS="-I${CT_HEADERS_DIR}"                                        \
+    LDFLAGS="-L${CT_SYSROOT_DIR}/lib"                                   \
+    "${CT_SRC_DIR}/mingwrt-${CT_MINGWRT_VERSION}-mingw32-src/configure" \
+        --prefix=${CT_SYSROOT_DIR}/                                     \
+        --includedir=${CT_HEADERS_DIR}                                  \
         --host=${CT_TARGET}
 
     CT_DoLog EXTRA "Building MinGW Runtime"
@@ -134,14 +134,14 @@ do_libc_finish() {
         mkdir -p "${CT_BUILD_DIR}/build-gnurx"
         cd "${CT_BUILD_DIR}/build-gnurx"
 
-        CT_DoExecLog CFG                                                    \
-        CFLAGS="${CT_CFLAGS_FOR_TARGET}"                                    \
-        "${CT_SRC_DIR}/mingw-libgnurx-${CT_MINGW_GNURX_VERSION}/configure"  \
-            --build=${CT_BUILD}                                             \
-            --host=${CT_TARGET}                                             \
-            --prefix=${CT_SYSROOT_DIR}                                      \
-            --includedir=${CT_HEADERS_DIR}                                  \
-            --enable-shared                                                 \
+        CT_DoExecLog CFG                                                        \
+        CFLAGS="${CT_CFLAGS_FOR_TARGET}"                                        \
+        "${CT_SRC_DIR}/mingw-libgnurx-${CT_MINGW_GNURX_VERSION}-src/configure"  \
+            --build=${CT_BUILD}                                                 \
+            --host=${CT_TARGET}                                                 \
+            --prefix=${CT_SYSROOT_DIR}                                          \
+            --includedir=${CT_HEADERS_DIR}                                      \
+            --enable-shared                                                     \
             --enable-static
 
         CT_DoLog EXTRA "Building GnuRX development files"
-- 
cgit v0.10.2-6-g49f6