Skip to content

Commit 3c25346

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

File tree

1 file changed

+13
-8
lines changed

1 file changed

+13
-8
lines changed

src/variant-i686.patch

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,48 @@
11
--- a/Dockerfile
22
+++ b/Dockerfile
3-
@@ -65,3 +65,3 @@ COPY src/w64devkit.c src/w64devkit.ico \
3+
@@ -74,3 +74,3 @@ COPY src/w64devkit.c src/w64devkit.ico \
44

55
-ARG ARCH=x86_64-w64-mingw32
66
+ARG ARCH=i686-w64-mingw32
77

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

1414
+# Disable UTF-8 manifest for Windows XP (#58)
1515
+RUN echo >/gcc-$GCC_VERSION/gcc/config/i386/winnt-utf8.manifest
1616
+
1717
WORKDIR /x-gcc
18-
@@ -104,2 +108,3 @@ RUN /gcc-$GCC_VERSION/configure \
18+
@@ -113,2 +117,3 @@ RUN /gcc-$GCC_VERSION/configure \
1919
--target=$ARCH \
2020
+ --with-arch=pentium4 \
2121
--enable-static \
22-
@@ -132,4 +137,4 @@ RUN /mingw-w64-v$MINGW_VERSION/mingw-w64-crt/configure \
22+
@@ -141,4 +146,4 @@ RUN /mingw-w64-v$MINGW_VERSION/mingw-w64-crt/configure \
2323
--disable-dependency-tracking \
2424
- --disable-lib32 \
2525
- --enable-lib64 \
2626
+ --enable-lib32 \
2727
+ --disable-lib64 \
2828
CFLAGS="-Os" \
29-
@@ -217,2 +222,3 @@ RUN /mingw-w64-v$MINGW_VERSION/mingw-w64-headers/configure \
29+
@@ -226,2 +231,3 @@ RUN /mingw-w64-v$MINGW_VERSION/mingw-w64-headers/configure \
3030
--with-default-msvcrt=msvcrt-os \
3131
+ --with-default-win32-winnt=0x0501 \
3232
&& make -j$(nproc) \
33-
@@ -227,4 +233,4 @@ RUN /mingw-w64-v$MINGW_VERSION/mingw-w64-crt/configure \
33+
@@ -236,4 +242,4 @@ RUN /mingw-w64-v$MINGW_VERSION/mingw-w64-crt/configure \
3434
--disable-dependency-tracking \
3535
- --disable-lib32 \
3636
- --enable-lib64 \
3737
+ --enable-lib32 \
3838
+ --disable-lib64 \
3939
CFLAGS="-Os" \
40-
@@ -239,2 +245,3 @@ RUN /mingw-w64-v$MINGW_VERSION/mingw-w64-libraries/winpthreads/configure \
40+
@@ -248,2 +254,3 @@ RUN /mingw-w64-v$MINGW_VERSION/mingw-w64-libraries/winpthreads/configure \
4141
--host=$ARCH \
4242
+ --with-arch=pentium4 \
4343
--enable-static \
44+
@@ -512,3 +519,3 @@ RUN cat $PREFIX/src/git-*.patch | patch -p1 \
45+
NO_GITWEB=1 \
46+
- MSYSTEM=MINGW64 \
47+
+ MSYSTEM=MINGW32 \
48+
CFLAGS="-Os -I/deps/include/" \

0 commit comments

Comments
 (0)