Skip to content

Commit 8a97f64

Browse files
committed
Update i686 variant patch
1 parent 3d09d65 commit 8a97f64

File tree

1 file changed

+15
-8
lines changed

1 file changed

+15
-8
lines changed

src/variant-i686.patch

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,50 @@
1+
diff --git a/Dockerfile b/Dockerfile
2+
index cbad367..5f0e922 100644
13
--- a/Dockerfile
24
+++ b/Dockerfile
3-
@@ -65,3 +65,3 @@ COPY src/w64devkit.c src/w64devkit.ico \
5+
@@ -74,3 +74,3 @@ COPY src/w64devkit.c src/w64devkit.ico \
46

57
-ARG ARCH=x86_64-w64-mingw32
68
+ARG ARCH=i686-w64-mingw32
79

8-
@@ -93,2 +93,3 @@ RUN /mingw-w64-v$MINGW_VERSION/mingw-w64-headers/configure \
10+
@@ -102,2 +102,3 @@ RUN /mingw-w64-v$MINGW_VERSION/mingw-w64-headers/configure \
911
--with-default-msvcrt=msvcrt-os \
1012
+ --with-default-win32-winnt=0x0501 \
1113
&& make -j$(nproc) \
12-
@@ -99,2 +100,5 @@ RUN ln -s $ARCH mingw
14+
@@ -108,2 +109,5 @@ RUN ln -s $ARCH mingw
1315

1416
+# Disable UTF-8 manifest for Windows XP (#58)
1517
+RUN echo >/gcc-$GCC_VERSION/gcc/config/i386/winnt-utf8.manifest
1618
+
1719
WORKDIR /x-gcc
18-
@@ -104,2 +108,3 @@ RUN /gcc-$GCC_VERSION/configure \
20+
@@ -113,2 +117,3 @@ RUN /gcc-$GCC_VERSION/configure \
1921
--target=$ARCH \
2022
+ --with-arch=pentium4 \
2123
--enable-static \
22-
@@ -132,4 +137,4 @@ RUN /mingw-w64-v$MINGW_VERSION/mingw-w64-crt/configure \
24+
@@ -141,4 +146,4 @@ RUN /mingw-w64-v$MINGW_VERSION/mingw-w64-crt/configure \
2325
--disable-dependency-tracking \
2426
- --disable-lib32 \
2527
- --enable-lib64 \
2628
+ --enable-lib32 \
2729
+ --disable-lib64 \
2830
CFLAGS="-Os" \
29-
@@ -217,2 +222,3 @@ RUN /mingw-w64-v$MINGW_VERSION/mingw-w64-headers/configure \
31+
@@ -226,2 +231,3 @@ RUN /mingw-w64-v$MINGW_VERSION/mingw-w64-headers/configure \
3032
--with-default-msvcrt=msvcrt-os \
3133
+ --with-default-win32-winnt=0x0501 \
3234
&& make -j$(nproc) \
33-
@@ -227,4 +233,4 @@ RUN /mingw-w64-v$MINGW_VERSION/mingw-w64-crt/configure \
35+
@@ -236,4 +242,4 @@ RUN /mingw-w64-v$MINGW_VERSION/mingw-w64-crt/configure \
3436
--disable-dependency-tracking \
3537
- --disable-lib32 \
3638
- --enable-lib64 \
3739
+ --enable-lib32 \
3840
+ --disable-lib64 \
3941
CFLAGS="-Os" \
40-
@@ -239,2 +245,3 @@ RUN /mingw-w64-v$MINGW_VERSION/mingw-w64-libraries/winpthreads/configure \
42+
@@ -248,2 +254,3 @@ RUN /mingw-w64-v$MINGW_VERSION/mingw-w64-libraries/winpthreads/configure \
4143
--host=$ARCH \
4244
+ --with-arch=pentium4 \
4345
--enable-static \
46+
@@ -512,3 +519,3 @@ RUN cat $PREFIX/src/git-*.patch | patch -p1 \
47+
NO_GITWEB=1 \
48+
- MSYSTEM=MINGW64 \
49+
+ MSYSTEM=MINGW32 \
50+
CFLAGS="-Os -I/deps/include/" \

0 commit comments

Comments
 (0)