Skip to content

Commit 796da6c

Browse files
committed
Update MinGW-w64 to latest version
The __chkstk issue seems to be resolved now. Unfortunately, there's still an access violation present, see: mstorsjo/llvm-mingw#94.
1 parent 8778d5e commit 796da6c

File tree

5 files changed

+116
-107
lines changed

5 files changed

+116
-107
lines changed

8.9/overrides.mk

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -317,6 +317,7 @@ define libffi_BUILD
317317
cd '$(BUILD_DIR)' && $(SOURCE_DIR)/configure \
318318
$(MXE_CONFIGURE_OPTS) \
319319
--disable-multi-os-directory \
320+
--disable-raw-api \
320321
$(if $(findstring posix,$(TARGET)), --disable-symvers)
321322

322323
$(MAKE) -C '$(BUILD_DIR)' -j '$(JOBS)'
@@ -333,7 +334,6 @@ endef
333334
define harfbuzz_BUILD
334335
# mman-win32 is only a partial implementation
335336
cd '$(BUILD_DIR)' && $(TARGET)-cmake \
336-
$(if $(findstring posix,$(TARGET)), -DCMAKE_C_STANDARD_LIBRARIES="") \
337337
-DHB_HAVE_GLIB=ON \
338338
-DHB_HAVE_FREETYPE=ON \
339339
-DHB_HAVE_ICU=OFF \
@@ -494,7 +494,6 @@ endef
494494
# libjpeg API)
495495
define libjpeg-turbo_BUILD
496496
cd '$(BUILD_DIR)' && $(TARGET)-cmake \
497-
$(if $(findstring posix,$(TARGET)), -DCMAKE_C_STANDARD_LIBRARIES="") \
498497
-DWITH_TURBOJPEG=OFF \
499498
-DENABLE_SHARED=$(CMAKE_SHARED_BOOL) \
500499
-DENABLE_STATIC=$(CMAKE_STATIC_BOOL) \
@@ -546,7 +545,6 @@ define poppler_BUILD
546545
(cd '$(SOURCE_DIR)' && $(PATCH) -p1 -u) < $(realpath $(dir $(lastword $(poppler_PATCHES))))/poppler-mingw-std-threads.patch)
547546

548547
cd '$(BUILD_DIR)' && '$(TARGET)-cmake' \
549-
$(if $(findstring posix,$(TARGET)), -DCMAKE_C_STANDARD_LIBRARIES="") \
550548
-DENABLE_TESTS=OFF \
551549
-DENABLE_ZLIB=ON \
552550
-DENABLE_LIBTIFF=ON \
@@ -579,9 +577,7 @@ endef
579577
# the zlib configure is a bit basic, so use cmake for shared
580578
# builds
581579
define zlib_BUILD_SHARED
582-
cd '$(BUILD_DIR)' && '$(TARGET)-cmake' \
583-
$(if $(findstring posix,$(TARGET)), -DCMAKE_C_STANDARD_LIBRARIES="") \
584-
'$(SOURCE_DIR)'
580+
cd '$(BUILD_DIR)' && '$(TARGET)-cmake' '$(SOURCE_DIR)'
585581
$(MAKE) -C '$(BUILD_DIR)' -j '$(JOBS)'
586582
$(MAKE) -C '$(BUILD_DIR)' -j 1 install
587583

@@ -758,7 +754,6 @@ define openexr_BUILD
758754
$(MAKE) -C '$(BUILD_DIR)/native/IlmImf' -j '$(JOBS)'
759755

760756
cd '$(BUILD_DIR)/cross' && $(TARGET)-cmake \
761-
$(if $(findstring posix,$(TARGET)), -DCMAKE_C_STANDARD_LIBRARIES="") \
762757
-DOPENEXR_CXX_STANDARD=14 \
763758
-DOPENEXR_INSTALL_PKG_CONFIG=ON \
764759
-DNATIVE_OPENEXR_BUILD_DIR='$(BUILD_DIR)/native' \
@@ -779,7 +774,6 @@ define ilmbase_BUILD
779774
$(MAKE) -C '$(BUILD_DIR)/native/Half' -j '$(JOBS)'
780775

781776
cd '$(BUILD_DIR)/cross' && $(TARGET)-cmake \
782-
$(if $(findstring posix,$(TARGET)), -DCMAKE_C_STANDARD_LIBRARIES="") \
783777
$(if $(findstring win32,$(TARGET)), -DILMBASE_FORCE_CXX03=ON) \
784778
-DOPENEXR_CXX_STANDARD=14 \
785779
-DNATIVE_ILMBASE_BUILD_DIR='$(BUILD_DIR)/native' \
@@ -793,7 +787,6 @@ endef
793787

794788
define cfitsio_BUILD_SHARED
795789
cd '$(BUILD_DIR)' && $(TARGET)-cmake \
796-
$(if $(findstring posix,$(TARGET)), -DCMAKE_C_STANDARD_LIBRARIES="") \
797790
-DBUILD_SHARED_LIBS=ON \
798791
'$(SOURCE_DIR)'
799792

@@ -834,7 +827,6 @@ define hdf5_BUILD
834827

835828
# H5_HAVE_IOEO=1 requires WINVER >= 0x600
836829
cd '$(BUILD_DIR)/cross' && '$(TARGET)-cmake' \
837-
$(if $(findstring posix,$(TARGET)), -DCMAKE_C_STANDARD_LIBRARIES="") \
838830
-DONLY_SHARED_LIBS=$(CMAKE_SHARED_BOOL) \
839831
-DH5_ENABLE_SHARED_LIB=$(CMAKE_SHARED_BOOL) \
840832
-DH5_ENABLE_STATIC_LIB=$(CMAKE_STATIC_BOOL) \
@@ -872,7 +864,6 @@ define x265_BUILD
872864

873865
# 12 bit
874866
cd '$(BUILD_DIR)/12bit' && $(TARGET)-cmake '$(SOURCE_DIR)/source' \
875-
$(if $(findstring posix,$(TARGET)), -DCMAKE_C_STANDARD_LIBRARIES="") \
876867
-DHIGH_BIT_DEPTH=ON \
877868
-DEXPORT_C_API=OFF \
878869
-DENABLE_SHARED=OFF \
@@ -886,7 +877,6 @@ define x265_BUILD
886877

887878
# 10 bit
888879
cd '$(BUILD_DIR)/10bit' && $(TARGET)-cmake '$(SOURCE_DIR)/source' \
889-
$(if $(findstring posix,$(TARGET)), -DCMAKE_C_STANDARD_LIBRARIES="") \
890880
-DHIGH_BIT_DEPTH=ON \
891881
-DEXPORT_C_API=OFF \
892882
-DENABLE_SHARED=OFF \
@@ -899,7 +889,6 @@ define x265_BUILD
899889

900890
# 8bit
901891
cd '$(BUILD_DIR)' && $(TARGET)-cmake '$(SOURCE_DIR)/source' \
902-
$(if $(findstring posix,$(TARGET)), -DCMAKE_C_STANDARD_LIBRARIES="") \
903892
-DHIGH_BIT_DEPTH=OFF \
904893
-DEXPORT_C_API=ON \
905894
-DENABLE_SHARED=$(CMAKE_SHARED_BOOL) \

0 commit comments

Comments
 (0)