Skip to content

Commit

Permalink
Refresh the variant patches
Browse files Browse the repository at this point in the history
  • Loading branch information
skeeto committed Nov 2, 2022
1 parent 5f3d7b8 commit 32e2f8b
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 13 deletions.
6 changes: 3 additions & 3 deletions src/variant-fortran.patch
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
--- a/Dockerfile
+++ b/Dockerfile
@@ -99,3 +99,3 @@ RUN cat $PREFIX/src/gcc-*.patch | patch -d/gcc-$GCC_VERSION -p1 \
@@ -102,3 +102,3 @@ RUN cat $PREFIX/src/gcc-*.patch | patch -d/gcc-$GCC_VERSION -p1 \
--with-pic \
- --enable-languages=c,c++ \
+ --enable-languages=c,c++,fortran \
--enable-libgomp \
@@ -250,3 +250,3 @@ RUN sed -i 's#=/mingw/include#=/include#' /gcc-$GCC_VERSION/gcc/config.gcc \
@@ -254,3 +254,3 @@ RUN sed -i 's#=/mingw/include#=/include#' /gcc-$GCC_VERSION/gcc/config.gcc \
--with-mpfr-lib=/deps/lib \
- --enable-languages=c,c++ \
+ --enable-languages=c,c++,fortran \
--enable-libgomp \
@@ -284,3 +284,3 @@ RUN $ARCH-gcc -DEXE=gcc.exe -DCMD=cc \
@@ -288,3 +288,3 @@ RUN $ARCH-gcc -DEXE=gcc.exe -DCMD=cc \
gcc gcc-ar gcc-nm gcc-ranlib gcov gcov-dump gcov-tool ld nm objcopy \
- objdump ranlib readelf size strings strip windmc windres \
+ objdump ranlib readelf size strings strip windmc windres gfortran \
Expand Down
14 changes: 7 additions & 7 deletions src/variant-i686.patch
Original file line number Diff line number Diff line change
@@ -1,37 +1,37 @@
--- a/Dockerfile
+++ b/Dockerfile
@@ -58,3 +58,3 @@ COPY src/w64devkit.c src/w64devkit.ico src/alias.c src/debugbreak.c \
@@ -61,3 +61,3 @@ COPY src/w64devkit.c src/w64devkit.ico src/alias.c src/debugbreak.c \

-ARG ARCH=x86_64-w64-mingw32
+ARG ARCH=i686-w64-mingw32

@@ -83,2 +83,3 @@ RUN /mingw-w64-v$MINGW_VERSION/mingw-w64-headers/configure \
@@ -86,2 +86,3 @@ RUN /mingw-w64-v$MINGW_VERSION/mingw-w64-headers/configure \
--host=$ARCH \
+ --with-default-win32-winnt=0x0501 \
&& make -j$(nproc) \
@@ -96,2 +97,3 @@ RUN cat $PREFIX/src/gcc-*.patch | patch -d/gcc-$GCC_VERSION -p1 \
@@ -99,2 +100,3 @@ RUN cat $PREFIX/src/gcc-*.patch | patch -d/gcc-$GCC_VERSION -p1 \
--target=$ARCH \
+ --with-arch=pentium4 \
--enable-static \
@@ -123,4 +125,4 @@ RUN /mingw-w64-v$MINGW_VERSION/mingw-w64-crt/configure \
@@ -126,4 +128,4 @@ RUN /mingw-w64-v$MINGW_VERSION/mingw-w64-crt/configure \
--disable-dependency-tracking \
- --disable-lib32 \
- --enable-lib64 \
+ --enable-lib32 \
+ --disable-lib64 \
CFLAGS="-Os" \
@@ -206,2 +208,3 @@ RUN /mingw-w64-v$MINGW_VERSION/mingw-w64-headers/configure \
@@ -210,2 +212,3 @@ RUN /mingw-w64-v$MINGW_VERSION/mingw-w64-headers/configure \
--host=$ARCH \
+ --with-default-win32-winnt=0x0501 \
&& make -j$(nproc) \
@@ -215,4 +218,4 @@ RUN /mingw-w64-v$MINGW_VERSION/mingw-w64-crt/configure \
@@ -219,4 +222,4 @@ RUN /mingw-w64-v$MINGW_VERSION/mingw-w64-crt/configure \
--disable-dependency-tracking \
- --disable-lib32 \
- --enable-lib64 \
+ --enable-lib32 \
+ --disable-lib64 \
CFLAGS="-Os" \
@@ -241,2 +244,3 @@ RUN sed -i 's#=/mingw/include#=/include#' /gcc-$GCC_VERSION/gcc/config.gcc \
@@ -231,2 +234,3 @@ RUN /mingw-w64-v$MINGW_VERSION/mingw-w64-libraries/winpthreads/configure \
--host=$ARCH \
+ --with-arch=pentium4 \
--enable-static \
6 changes: 3 additions & 3 deletions src/variant-mini.patch
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
--- a/Dockerfile
+++ b/Dockerfile
@@ -250,3 +250,3 @@ RUN sed -i 's#=/mingw/include#=/include#' /gcc-$GCC_VERSION/gcc/config.gcc \
@@ -254,3 +254,3 @@ RUN sed -i 's#=/mingw/include#=/include#' /gcc-$GCC_VERSION/gcc/config.gcc \
--with-mpfr-lib=/deps/lib \
- --enable-languages=c,c++ \
+ --enable-languages=c \
--enable-libgomp \
@@ -269,7 +269,3 @@ RUN sed -i 's#=/mingw/include#=/include#' /gcc-$GCC_VERSION/gcc/config.gcc \
@@ -273,7 +273,3 @@ RUN sed -i 's#=/mingw/include#=/include#' /gcc-$GCC_VERSION/gcc/config.gcc \
$PREFIX/bin/ld.bfd.exe $PREFIX/bin/c++.exe $PREFIX/bin/lto-dump.exe \
- && $ARCH-gcc -DEXE=g++.exe -DCMD=c++ \
- -Os -fno-asynchronous-unwind-tables \
Expand All @@ -14,7 +14,7 @@
- $PREFIX/src/alias.c -lkernel32
+ $PREFIX/bin/c++filt.exe

@@ -282,3 +278,3 @@ RUN $ARCH-gcc -DEXE=gcc.exe -DCMD=cc \
@@ -286,3 +282,3 @@ RUN $ARCH-gcc -DEXE=gcc.exe -DCMD=cc \
-o $PREFIX/bin/c99.exe $PREFIX/src/alias.c -lkernel32 \
- && printf '%s\n' addr2line ar as c++filt cpp dlltool dllwrap elfedit g++ \
+ && printf '%s\n' addr2line ar as cpp dlltool dllwrap elfedit \
Expand Down

0 comments on commit 32e2f8b

Please sign in to comment.