Skip to content
Snippets Groups Projects
Commit 0f4de53a authored by Oliver Bock's avatar Oliver Bock
Browse files

Removing workaround (fixed upstream)

parent 91b382fb
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
build.sh
+ 0
− 3
View file @ 0f4de53a
......@@ -193,10 +193,7 @@ prepare_win32()
echo "Preparing MinGW build script..." | tee -a $LOGFILE
cd $ROOT/3rdparty/mingw/xscripts || failure
# note: svn has no force/overwrite switch. the file might not be updated when patched
patch x86-mingw32-build.sh < $ROOT/patches/x86-mingw32-build.sh.patch >> $LOGFILE || failure # temporary workaround
patch x86-mingw32-build.sh.batch < $ROOT/patches/x86-mingw32-build.sh.batch.patch >> $LOGFILE || failure # temporary workaround
patch x86-mingw32-build.sh.conf < $ROOT/patches/x86-mingw32-build.sh.conf.patch >> $LOGFILE || failure
patch x86-mingw32-build.sh.conf < $ROOT/patches/x86-mingw32-build.sh.conf_versions.patch >> $LOGFILE || failure # temporary workaround
chmod +x x86-mingw32-build.sh >> $LOGFILE || failure
return 0
......
patches/x86-mingw32-build.sh.batch.patch deleted 100644 → 0
+ 0
− 45
View file @ 91b382fb
--- x86-mingw32-build.sh.batch
+++ x86-mingw32-build.sh.batch.new 2009-02-15 01:51:59.000000000 +0100
@@ -32,14 +32,14 @@
if isyes $ALLOW_DOWNLOADS
then
option GCC_VERSION "`enumerate $PACKAGE_DIR/gcc-core- -src.tar.gz`"
- option BINUTILS_VERSION "`enumerate $PACKAGE_DIR/binutils- -src.tar.gz`"
- option RUNTIME_VERSION "`enumerate $PACKAGE_DIR/mingw-runtime- -src.tar.gz`"
- option W32API_VERSION "`enumerate $PACKAGE_DIR/w32api- -src.tar.gz`"
+ option BINUTILS_VERSION "`enumerate $PACKAGE_DIR/binutils- -mingw32-src.tar.gz`"
+ option RUNTIME_VERSION "`enumerate $PACKAGE_DIR/mingwrt- -mingw32-src.tar.gz`"
+ option W32API_VERSION "`enumerate $PACKAGE_DIR/w32api- -mingw32-src.tar.gz`"
else
GCC_VERSION=`enumerate $PACKAGE_DIR/gcc-core- -src.tar.gz`
- BINUTILS_VERSION=`enumerate $PACKAGE_DIR/binutils- -src.tar.gz`
- RUNTIME_VERSION=`enumerate $PACKAGE_DIR/mingw-runtime- -src.tar.gz`
- W32API_VERSION=`enumerate $PACKAGE_DIR/w32api- -src.tar.gz`
+ BINUTILS_VERSION=`enumerate $PACKAGE_DIR/binutils- -mingw32-src.tar.gz`
+ RUNTIME_VERSION=`enumerate $PACKAGE_DIR/mingwrt- -mingw32-src.tar.gz`
+ W32API_VERSION=`enumerate $PACKAGE_DIR/w32api- -mingw32-src.tar.gz`
fi
GCC_VERSION=`newest $GCC_VERSION`
BINUTILS_VERSION=`newest $BINUTILS_VERSION`
@@ -73,17 +73,17 @@
esac
case $BUILD_COMPONENTS in *binutils*)
test -n "$BINUTILS_VERSION" && \
- option DOWNLOAD binutils-$BINUTILS_VERSION-src.tar.gz
+ option DOWNLOAD binutils-$BINUTILS_VERSION-mingw32-src.tar.gz
option BINUTILS_BASE_OPTIONS "$BINUTILS_USER_OPTIONS" ;;
esac
-case $BUILD_COMPONENTS in *mingw-runtime*)
+case $BUILD_COMPONENTS in *mingwrt*)
test -n "$RUNTIME_VERSION" && \
- option DOWNLOAD mingw-runtime-$RUNTIME_VERSION-src.tar.gz
+ option DOWNLOAD mingwrt-$RUNTIME_VERSION-mingw32-src.tar.gz
option RUNTIME_BASE_OPTIONS "$RUNTIME_USER_OPTIONS" ;;
esac
case $BUILD_COMPONENTS in *w32api*)
test -n "$W32API_VERSION" && \
- option DOWNLOAD w32api-$W32API_VERSION-src.tar.gz
+ option DOWNLOAD w32api-$W32API_VERSION-mingw32-src.tar.gz
option W32API_BASE_OPTIONS "$W32API_USER_OPTIONS" ;;
esac
patches/x86-mingw32-build.sh.conf.patch
+ 2
− 4
View file @ 0f4de53a
--- x86-mingw32-build.sh.conf
+++ x86-mingw32-build.sh.conf.new 2008-05-16 16:04:14.000000000 +0200
+++ x86-mingw32-build.sh.conf 2009-03-13 12:08:40.000000000 +0100
@@ -35,16 +35,16 @@
# the `x86-mingw32-build.sh.hosts' file for the `mirror' field
# in the following URL, to establish a default download host.
......@@ -21,18 +21,16 @@
#
# 4) Package versions, from which the compiler will be built.
#
@@ -93,12 +93,12 @@
@@ -92,11 +92,11 @@
# the corresponding package is available in the PACKAGE_DIR, or
# if it is selected for download.
#
- option GCC_LANGUAGE_OPTIONS ada
+# option GCC_LANGUAGE_OPTIONS ada
option GCC_LANGUAGE_OPTIONS c++
- option GCC_LANGUAGE_OPTIONS d
- option GCC_LANGUAGE_OPTIONS f77
- option GCC_LANGUAGE_OPTIONS java
- option GCC_LANGUAGE_OPTIONS objc
+# option GCC_LANGUAGE_OPTIONS d
+# option GCC_LANGUAGE_OPTIONS f77
+# option GCC_LANGUAGE_OPTIONS java
+# option GCC_LANGUAGE_OPTIONS objc
......
patches/x86-mingw32-build.sh.conf_versions.patch deleted 100644 → 0
+ 0
− 26
View file @ 91b382fb
--- x86-mingw32-build.sh.conf
+++ x86-mingw32-build.sh.conf.new 2009-02-15 01:16:34.000000000 +0100
@@ -48,10 +48,10 @@
#
# 4) Package versions, from which the compiler will be built.
#
- assume GCC_VERSION 3.4.5-20060117-1
- assume BINUTILS_VERSION 2.18.50-20080109
- assume RUNTIME_VERSION 3.14
- assume W32API_VERSION 3.11
+ assume GCC_VERSION 3.4.5-20060117-2
+ assume BINUTILS_VERSION 2.19.1
+ assume RUNTIME_VERSION 3.15.2
+ assume W32API_VERSION 3.13
assume GDC_VERSION 0.24
#
# 5) Automatic patching of downloaded packages: if any appropriately
@@ -80,7 +80,7 @@
option BUILD_COMPONENTS headers
option BUILD_COMPONENTS gcc
option BUILD_COMPONENTS w32api
- option BUILD_COMPONENTS mingw-runtime
+ option BUILD_COMPONENTS mingwrt
#
# 7) GCC language options. The compiler MUST be built to support
# at least `C' language.
patches/x86-mingw32-build.sh.patch deleted 100644 → 0
+ 0
− 53
View file @ 91b382fb
--- x86-mingw32-build.sh
+++ x86-mingw32-build.sh.new 2009-02-15 00:22:14.000000000 +0100
@@ -77,7 +77,7 @@
then
cd binutils*/build
else
- $RUN prepare binutils-$BINUTILS_VERSION
+ $RUN prepare binutils-$BINUTILS_VERSION "-mingw32-src"
$RUN setbuilddir binutils*
$RUN ../configure --prefix="$INSTALL_DIR" --target="$TARGET" \
$GLOBAL_BASE_OPTIONS $BINUTILS_BASE_OPTIONS || die $? \
@@ -126,9 +126,9 @@
cd "$WORKING_DIR"; test $LEAN_BUILD && rm -rf build-gcc
;;
- headers | mingw-runtime | w32api)
- test -r mingw-runtime-*/configure || $RUN prepare mingw-runtime-$RUNTIME_VERSION
- test -r w32api-*/configure || $RUN prepare w32api-$W32API_VERSION
+ headers | mingwrt | w32api)
+ test -r mingwrt-*/configure || $RUN prepare mingwrt-$RUNTIME_VERSION "-mingw32-src"
+ test -r w32api-*/configure || $RUN prepare w32api-$W32API_VERSION "-mingw32-src"
case $COMPONENT in
headers)
$RUN mkdir -p "$INSTALL_DIR/include"
@@ -136,16 +136,16 @@
$RUN cd "$INSTALL_DIR" && $RUN ln -s . usr )
test -e "$INSTALL_DIR/usr/local" || (
$RUN cd "$INSTALL_DIR/usr" && $RUN ln -s . local )
- $RUN cp -r mingw-runtime-*/include "$INSTALL_DIR" || die $? \
+ $RUN cp -r mingwrt-*/include "$INSTALL_DIR" || die $? \
"$unrecoverable installing mingw-runtime headers"
$RUN cp -r w32api-*/include "$INSTALL_DIR" || die $? \
"$unrecoverable installing w32api headers"
;;
- mingw-runtime)
+ mingwrt)
test -e w32api || $RUN ln -s w32api-* w32api
;;
esac
- case $COMPONENT in mingw-runtime | w32api)
+ case $COMPONENT in mingwrt | w32api)
setbuilddir ${COMPONENT}-*
$RUN ../configure --prefix="$INSTALL_DIR" --host="$TARGET" \
--build=${BUILD_PLATFORM=`../config.guess`} || die $? \
@@ -160,7 +160,7 @@
;;
esac; done
- cd "$WORKING_DIR"; test $LEAN_BUILD && $RUN rm -rf mingw-runtime-* w32api-*
+ cd "$WORKING_DIR"; test $LEAN_BUILD && $RUN rm -rf mingwrt-* w32api-*
BUILD_COMPONENTS=`case $BUILD_COMPONENTS in *gcc*) echo gcc ;; esac`
done
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment

AEI Privacy Policy Imprint