diff --git a/mingw-w64-v8/017-abseil-mingw-thread-fixes.patch b/mingw-w64-v8/017-abseil-mingw-thread-fixes.patch new file mode 100644 index 0000000..5f21f09 --- /dev/null +++ b/mingw-w64-v8/017-abseil-mingw-thread-fixes.patch @@ -0,0 +1,31 @@ +--- a/absl/base/internal/thread_identity.h ++++ b/absl/base/internal/thread_identity.h +@@ -217,6 +217,8 @@ + #error ABSL_THREAD_IDENTITY_MODE cannot be directly set + #elif defined(ABSL_FORCE_THREAD_IDENTITY_MODE) + #define ABSL_THREAD_IDENTITY_MODE ABSL_FORCE_THREAD_IDENTITY_MODE ++#elif defined(__MINGW32__) && defined(ABSL_HAVE_THREAD_LOCAL) ++#define ABSL_THREAD_IDENTITY_MODE ABSL_THREAD_IDENTITY_MODE_USE_CPP11 + #elif defined(_WIN32) && !defined(__MINGW32__) + #define ABSL_THREAD_IDENTITY_MODE ABSL_THREAD_IDENTITY_MODE_USE_CPP11 + #elif defined(__APPLE__) && defined(ABSL_HAVE_THREAD_LOCAL) +--- a/absl/synchronization/internal/win32_waiter.h ++++ b/absl/synchronization/internal/win32_waiter.h +@@ -20,7 +20,7 @@ + #include + #endif + +-#if defined(_WIN32) && !defined(__MINGW32__) && \ ++#if defined(_WIN32) && \ + _WIN32_WINNT >= _WIN32_WINNT_VISTA + + #include "absl/base/config.h" +@@ -66,7 +66,7 @@ + ABSL_NAMESPACE_END + } // namespace absl + +-#endif // defined(_WIN32) && !defined(__MINGW32__) && ++#endif // defined(_WIN32) && + // _WIN32_WINNT >= _WIN32_WINNT_VISTA + + #endif // ABSL_SYNCHRONIZATION_INTERNAL_WIN32_WAITER_H_ diff --git a/mingw-w64-v8/PKGBUILD b/mingw-w64-v8/PKGBUILD index 153d574..746c941 100644 --- a/mingw-w64-v8/PKGBUILD +++ b/mingw-w64-v8/PKGBUILD @@ -4,7 +4,7 @@ _realname=v8 pkgbase=mingw-w64-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" -pkgver=14.6.202.26 +pkgver=14.6.202.33 pkgrel=2 pkgdesc="Fast and modern Javascript engine (mingw-w64)" arch=('any') @@ -51,6 +51,7 @@ source=("https://github.com/v8/v8/archive/refs/tags/${pkgver}.tar.gz" "014-heap-use-proper-sources.patch" "015-abseil-build-as-static-lib.patch" "016-zlib-use-system-lib.patch" + "017-abseil-mingw-thread-fixes.patch" "icu.gn" "zlib.gn" "v8_libbase.pc" @@ -58,7 +59,7 @@ source=("https://github.com/v8/v8/archive/refs/tags/${pkgver}.tar.gz" "v8.pc" "disable-cet.diff" "mingw-printf.diff") -sha256sums=('9967736b8381fdf34de72c3f84eebbdb30a867cb94d9a8ff6993504549cc65b5' +sha256sums=('c467f6745a9066905c5c2d9f1e22e426e1f1cc89365219ee14a17fb78839536f' 'SKIP' 'SKIP' 'SKIP' @@ -87,6 +88,7 @@ sha256sums=('9967736b8381fdf34de72c3f84eebbdb30a867cb94d9a8ff6993504549cc65b5' '2415e05518836b1b3f4c0ca9f993145ba5d9d406ce47d6c7c3cb2fa76fba7c72' '250ca72be5d93c91d23c07478275fcbc09a3f6012a90c44b8af92f9c3e18938b' 'a4275f41723cc990f2f43559ce716100830a8ce3f38e4878f6bf36d70d47b646' + '012b2c89ed2933080d8cc49e3654b7c98c96346c445a77a21df18e27b6215abe' 'e1bc88af48143f29f5805b8ac5d77addef1b09318d1f5f127a9281872c00303b' '7e1e39a3dc69632f7bf9182c92405186ce709aca921cf0abefadb6fa8b825510' '71ac09cff81a983c63cbeee405a18b092655e6c608da1ede3aacc568edb80b39' @@ -115,6 +117,7 @@ prepare() { echo ":: Patching abseil-cpp directory" cd "${srcdir}"/abseil-cpp patch -p1 -i "${srcdir}"/015-abseil-build-as-static-lib.patch + patch -p1 -i "${srcdir}"/017-abseil-mingw-thread-fixes.patch ln -sf "${srcdir}"/abseil-cpp "${srcdir}"/${_realname}-${pkgver}/third_party echo ":: Patching zlib directory"