Commit 44736e0a authored by Martin Storsjö's avatar Martin Storsjö

contrib: flac: Don't force __MSVCRT_VERSION__ to a specific (old) version

The forcing of this define was added upstream many years ago, probably
to expose certain features that aren't available by default in the old
mingw.org headers. In mingw-w64, setting __MSVCRT_VERSION__ doesn't
expose much new functionality at all (contrary to in mingw.org), and
the default in mingw-w64 is 0x0700.

Therefore, since we're using mingw-w64 anyway, don't force this version
but just use whatever the toolchain default is, assuming the default
is new enough.

This fixes building with mingw-w64 with the default msvcrt set to
ucrtbase.
parent 18de5f37
diff -urN flac-orig/configure.ac flac/configure.ac
--- flac-orig/configure.ac 2017-01-01 03:46:35.224989057 +0200
+++ flac/configure.ac 2018-02-26 00:37:22.876134887 +0200
@@ -178,7 +178,6 @@
os_is_windows=no
case "$host" in
*-*-cygwin|*mingw*)
- CPPFLAGS="-D__MSVCRT_VERSION__=0x0601 $CPPFLAGS"
os_is_windows=yes
;;
esac
......@@ -30,6 +30,7 @@ ifeq ($(ANDROID_ABI), x86)
cd $(UNPACK_DIR) && sed -i.orig -e s/"# undef USE_OBSOLETE_SIGCONTEXT_FLAVOR"/"#define USE_OBSOLETE_SIGCONTEXT_FLAVOR"/g src/libFLAC/cpu.c
endif
endif
$(APPLY) $(SRC)/flac/dont-force-msvcrt-version.patch
$(call pkg_static,"src/libFLAC/flac.pc.in")
$(UPDATE_AUTOCONFIG)
$(MOVE)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment