pixman: Branch 'master' - 2 commits

[GitLab Mirror]

 meson.build |   17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

New commits:
commit e8321503c6404012f2c760f381a1e19f8e0ef141
Author: Mathieu Duponchelle <mathieu at centricular.com>
Date:   Thu Jan 30 23:31:35 2020 +0100

    meson: add missing function check (getisax)
    
    .. and add gettimeofday to the list of funcs to check instead
    of having a separate check for it.

diff --git a/meson.build b/meson.build
index 45ef219..15d3409 100644
--- a/meson.build
+++ b/meson.build
@@ -443,7 +443,7 @@ if pthreads_found
   config.set('HAVE_PTHREADS', 1)
 endif
 
-funcs = ['sigaction', 'alarm', 'mprotect', 'getpagesize', 'mmap']
+funcs = ['sigaction', 'alarm', 'mprotect', 'getpagesize', 'mmap', 'getisax', 'gettimeofday']
 # mingw claimes to have posix_memalign, but it doesn't
 if host_machine.system() != 'windows'
   funcs += 'posix_memalign'
@@ -455,10 +455,6 @@ foreach f : funcs
   endif
 endforeach
 
-if cc.has_function('gettimeofday')
-  config.set('HAVE_GETTIMEOFDAY', 1)
-endif
-
 # This is only used in one test, that defines _GNU_SOURCE
 if cc.has_function('feenableexcept',
                    prefix : '#define _GNU_SOURCE\n#include <fenv.h>',
commit 8992d5b4fc37b3bd650e26d450f7fb6faefebaeb
Author: Mathieu Duponchelle <mathieu at centricular.com>
Date:   Thu Jan 30 23:29:20 2020 +0100

    meson: finish porting over mmx and ssse2 flags for sun and msvc
    
    Those flags are set by the configure.ac script

diff --git a/meson.build b/meson.build
index 72d7e3d..45ef219 100644
--- a/meson.build
+++ b/meson.build
@@ -86,7 +86,12 @@ endif
 use_mmx = get_option('mmx')
 have_mmx = false
 mmx_flags = []
-if cc.get_id() != 'msvc'
+
+if cc.get_id() == 'msvc'
+  mmx_flags = ['/w14710', '/w14714', '/wd4244']
+elif cc.get_id() == 'sun'
+  mmx_flags = ['-xarch=sse']
+else
   mmx_flags = ['-mmmx', '-Winline']
 endif
 if not use_mmx.disabled()
@@ -143,7 +148,9 @@ endif
 use_sse2 = get_option('sse2')
 have_sse2 = false
 sse2_flags = []
-if cc.get_id() != 'msvc'
+if cc.get_id() == 'sun'
+  sse2_flags = ['-xarch=sse2']
+elif cc.get_id() != 'msvc'
   sse2_flags = ['-msse2', '-Winline']
 endif
 if not use_sse2.disabled()