CVS commit: pkgsrc/devel/meson

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Fri Aug  7 13:04:09 UTC 2020

Modified Files:
        pkgsrc/devel/meson: Makefile distinfo
Added Files:
        pkgsrc/devel/meson/patches: patch-mesonbuild_compilers_mixins_gnu.py

Log Message:
meson: Turn off -z ignore by default on SunOS.

This shouldn't be applied to every single invocation, as it can be too
aggressive and for example remove -lssp when -fstack-protector is being used,
breaking PKGSRC_USE_SSP checks.

Fixes lots of packages.  Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 pkgsrc/devel/meson/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/devel/meson/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/devel/meson/patches/patch-mesonbuild_compilers_mixins_gnu.py

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/meson/Makefile
diff -u pkgsrc/devel/meson/Makefile:1.15 pkgsrc/devel/meson/Makefile:1.16
--- pkgsrc/devel/meson/Makefile:1.15    Tue Jul 28 22:43:01 2020
+++ pkgsrc/devel/meson/Makefile Fri Aug  7 13:04:08 2020
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.15 2020/07/28 22:43:01 tnn Exp $
+# $NetBSD: Makefile,v 1.16 2020/08/07 13:04:08 jperkin Exp $
 
 DISTNAME=      meson-0.55.0
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    devel python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=m/meson/}
 

Index: pkgsrc/devel/meson/distinfo
diff -u pkgsrc/devel/meson/distinfo:1.13 pkgsrc/devel/meson/distinfo:1.14
--- pkgsrc/devel/meson/distinfo:1.13    Tue Jul 28 23:28:23 2020
+++ pkgsrc/devel/meson/distinfo Fri Aug  7 13:04:08 2020
@@ -1,9 +1,10 @@
-$NetBSD: distinfo,v 1.13 2020/07/28 23:28:23 tnn Exp $
+$NetBSD: distinfo,v 1.14 2020/08/07 13:04:08 jperkin Exp $
 
 SHA1 (meson-0.55.0.tar.gz) = 266c35ad4ea0b526e3437500b99a0745adf82d92
 RMD160 (meson-0.55.0.tar.gz) = 59db72dded4bf8dfb53dd5eb00d229e377a2ae80
 SHA512 (meson-0.55.0.tar.gz) = bf2a5bab19deb433e363bf569527dbd1a9e8c0f77482aa077abbaa480dadc396e43148957473a31ecd9d3965578d2f7b7dc8808839c619ae2c0d419aed72d4e2
 Size (meson-0.55.0.tar.gz) = 1742882 bytes
+SHA1 (patch-mesonbuild_compilers_mixins_gnu.py) = 17f09e1b147f6baa434091f8a31b48f1941004f6
 SHA1 (patch-mesonbuild_dependencies_dev.py) = ce9b93369d771f7e24208923b58af769e51bcd98
 SHA1 (patch-mesonbuild_environment.py) = d0340ea4149c7ed89fd64d0f1631721f7b9f04aa
 SHA1 (patch-mesonbuild_modules_pkgconfig.py) = 7b5dff2fbc29199a2b1b18a0073e73461c517744

Added files:

Index: pkgsrc/devel/meson/patches/patch-mesonbuild_compilers_mixins_gnu.py
diff -u /dev/null pkgsrc/devel/meson/patches/patch-mesonbuild_compilers_mixins_gnu.py:1.1
--- /dev/null   Fri Aug  7 13:04:09 2020
+++ pkgsrc/devel/meson/patches/patch-mesonbuild_compilers_mixins_gnu.py Fri Aug  7 13:04:08 2020
@@ -0,0 +1,15 @@
+$NetBSD: patch-mesonbuild_compilers_mixins_gnu.py,v 1.1 2020/08/07 13:04:08 jperkin Exp $
+
+Do not default to -z ignore on SunOS, it breaks for example -fstack-protector.
+
+--- mesonbuild/compilers/mixins/gnu.py.orig    2020-06-29 17:00:07.000000000 +0000
++++ mesonbuild/compilers/mixins/gnu.py
+@@ -144,7 +144,7 @@ class GnuLikeCompiler(metaclass=abc.ABCM
+                              'b_ndebug', 'b_staticpic', 'b_pie']
+         if not (self.info.is_windows() or self.info.is_cygwin() or self.info.is_openbsd()):
+             self.base_options.append('b_lundef')
+-        if not self.info.is_windows() or self.info.is_cygwin():
++        if not (self.info.is_windows() or self.info.is_sunos()) or self.info.is_cygwin():
+             self.base_options.append('b_asneeded')
+         if not self.info.is_hurd():
+             self.base_options.append('b_sanitize')