Arch Linux User Repository

Hi!

There's a small problem with sourcing mingw-env: the -O2 flag in mingw-env.sh ends up overriding meson's --optimization parameter.

My software happens to need the -O3 flag to compile. Lower values don't work.

I pushed a less intrusive change that keeps the 2 different config files for now,so no PKGBUILD should break

the problem is that it breaks fribidi, I hope to find some time tomorrow to do some tests, thank you

I tried your modification and yes it works!

I use the mingw-w64-mesa-git PKGBUILD, with the following modifications:

MESON_EXE_WRAPPER=/usr/bin/${_arch}-wine NEED_WINE=1 ${_arch}-meson build-${_arch} -Db_lto=false -Dgallium-drivers=swrast -Dbuild-tests=true

ninja test -C build-${_arch} ${MAKEFLAGS}

Hi,

can you please paste you mesa PKGBUILD so I can do some tests?

a change like this one:

-pkgrel=20
+pkgrel=21
 arch=('any')
 pkgdesc="Meson wrapper for MinGW (mingw-w64)"
 depends=('meson' 'mingw-w64-gcc' 'mingw-w64-pkg-config')
@@ -13,7 +13,7 @@ url="http://fedoraproject.org/wiki/MinGW"
 source=("toolchain_generator.py"
         "meson-mingw-wrapper")
 sha256sums=('20b0c2add1182f2b8cdf53dea7c6fd870989a39abd7713acbce924cde716a85b'
-            'c91f2bbcafad7b742f13c6bd46324a03b70066b348621ce6a20f4a05005985ef')
+            '9430f5d112c05b766a18c11b2b1f4ac9f190cd3e7201229b02ff3e1cd7877209')
 _architectures="i686-w64-mingw32 x86_64-w64-mingw32"

 build() {
@@ -24,7 +24,6 @@ build() {
     unset LDFLAGS
     source mingw-env ${_arch}
     python toolchain_generator.py --arch ${_arch} --output-file toolchain-${_arch}.meson 
-    python toolchain_generator.py --arch ${_arch} --output-file toolchain-${_arch}-wine.meson --need-exe-wrapper 
     sed "s|@TRIPLE@|${_arch}|g;" meson-mingw-wrapper > ${_arch}-meson
   done
 }
@@ -36,7 +35,6 @@ package() {
   for _arch in ${_architectures}; do
     install -m 755 "${srcdir}/${_arch}-meson" "$pkgdir/usr/bin/${_arch}-meson"
     install -m 644 toolchain-${_arch}.meson "${pkgdir}"/usr/share/mingw/
-    install -m 644 toolchain-${_arch}-wine.meson "${pkgdir}"/usr/share/mingw/
   done
 }

diff --git a/meson-mingw-wrapper b/meson-mingw-wrapper
index 9adc2d0..240c397 100644
--- a/meson-mingw-wrapper
+++ b/meson-mingw-wrapper
@@ -2,11 +2,14 @@

 if [ -z ${CROSS_FILE} ]
 then
-  if [ -z ${NEED_WINE} ]
+  CROSS_FILE=/usr/share/mingw/toolchain-@TRIPLE@.meson
+fi
+
+if [ -z ${MESON_EXE_WRAPPER} ]
+then
+  if [ -n ${NEED_WINE} ]
   then
-    CROSS_FILE=/usr/share/mingw/toolchain-@TRIPLE@.meson
-  else
-    CROSS_FILE=/usr/share/mingw/toolchain-@TRIPLE@-wine.meson
+    MESON_EXE_WRAPPER=/usr/bin/@TRIPLE@-wine
   fi
 fi

breaks fribidi tests

I appears it helps to set MESON_EXE_WRAPPER env variable when calling i686-w64-mingw32-meson when configuring mesa for tests to be run, should it be defined inside the wrapper when NEED_WINE is set ?

would this be an alternative to having to use 2 different config files ?

Hi,

I think we need to change properties to built-in options here. I cannot test this change before tomorrow

hello,

seems something has changed in latest meson, can you have a look:

DEPRECATION: c_args in the [properties] section of the machine file is deprecated, use the [built-in options] section.

DEPRECATION: cpp_args in the [properties] section of the machine file is deprecated, use the [built-in options] section.

DEPRECATION: c_link_args in the [properties] section of the machine file is deprecated, use the [built-in options] section.

DEPRECATION: cpp_link_args in the [properties] section of the machine file is deprecated, use the [built-in options] section.

Please take a look here