ExternalVendorCode/crosstool-ng
1
0
Fork 0
mirror of https://github.com/crosstool-ng/crosstool-ng.git synced 2025-03-24 04:55:19 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

libc/mingw: fix mingw source dirs

Browse Source 
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>
This commit is contained in:
Yann E. MORIN" 2011-08-01 00:16:12 +02:00
parent 9be30ce778
commit f0b0c6666f
2 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/build/kernel/mingw32.sh
View File

@ -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

44
scripts/build/libc/mingw.sh
View File

@ -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"