Arch Linux User Repository

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

Hello.

How can I add custom flags to my build ?

I tried setting CXXFLAGS/LDFLAGS/CFLAGS without luck:

CXXFLAGS="-fno-lto" ${_arch}-meson

xan.

That's similar to qmake. But you can still at least insert the flags at build time of the mingw-w64-mesion package instead of duplicating them. I did the same for mingw-w64-qt5-base: https://github.com/Martchus/PKGBUILDs/commit/6face8aef30195f0800623e38e60c460c3db0876

This way we can change flags when needed by only customizing mingw-w64-environment and just need to rebuild mingw-w64-meson (and mingw-w64-qt5-base).

ok; seems their design allow to have rules for native and cross targets in the same build, no idea what it's for

@xantares, I don't think that this work for meson, from the docs:

https://mesonbuild.com/Builtin-options.html

c_args, cpp_args, c_link_args, and cpp_link_args only affect native builds, when cross compiling they will not be applied to binaries or libraries targeting the host system, only those being run on the build system.

I just did a quick test adding -v to ninja for mingw-w64-libsoup, current meson wrapper:

[84/91] x86_64-w64-mingw32-gcc -Iexamples/c590b3c@@simple-proxy@exe -Iexamples -I../examples -I. -I../ -Ilibsoup -I/usr/x86_64-w64-mingw32/include/glib-2.0 -I/usr/x86_64-w64-mingw32/lib/glib-2.0/include -I/usr/x86_64-w64-mingw32/include -I/usr/x86_64-w64-mingw32/lib/libffi-3.2.1/include -flto -fdiagnostics-color=always -pipe -Wall -Winvalid-pch -std=c89 -O3 -D_DEFAULT_SOURCE -D__USE_MINGW_ANSI_STDIO=1 -DHAVE_CONFIG_H -Wall -Wmissing-include-dirs -Wpointer-arith -Winit-self -Wdeclaration-after-statement -Werror=missing-prototypes -Werror=implicit-function-declaration -Werror=aggregate-return -Werror=format=2 -Wstrict-prototypes -Wno-format-zero-length -Wp,-D_FORTIFY_SOURCE=2 -fno-plt -fexceptions --param=ssp-buffer-size=4 -mms-bitfields -mms-bitfields -mms-bitfields -MD -MQ 'examples/c590b3c@@simple-proxy@exe/simple-proxy.c.obj' -MF 'examples/c590b3c@@simple-proxy@exe/simple-proxy.c.obj.d' -o 'examples/c590b3c@@simple-proxy@exe/simple-proxy.c.obj' -c ../examples/simple-proxy.c

meson wrapper modified as you suggest:

[82/91] x86_64-w64-mingw32-gcc -Iexamples/c590b3c@@simple-proxy@exe -Iexamples -I../examples -I. -I../ -Ilibsoup -I/usr/x86_64-w64-mingw32/include/glib-2.0 -I/usr/x86_64-w64-mingw32/lib/glib-2.0/include -I/usr/x86_64-w64-mingw32/include -I/usr/x86_64-w64-mingw32/lib/libffi-3.2.1/include -flto -fdiagnostics-color=always -pipe -Wall -Winvalid-pch -std=c89 -O3 -D_DEFAULT_SOURCE -D__USE_MINGW_ANSI_STDIO=1 -DHAVE_CONFIG_H -Wall -Wmissing-include-dirs -Wpointer-arith -Winit-self -Wdeclaration-after-statement -Werror=missing-prototypes -Werror=implicit-function-declaration -Werror=aggregate-return -Werror=format=2 -Wstrict-prototypes -Wno-format-zero-length -mms-bitfields -mms-bitfields -mms-bitfields -MD -MQ 'examples/c590b3c@@simple-proxy@exe/simple-proxy.c.obj' -MF 'examples/c590b3c@@simple-proxy@exe/simple-proxy.c.obj.d' -o 'examples/c590b3c@@simple-proxy@exe/simple-proxy.c.obj' -c ../examples/simple-proxy.c