CVS commit: pkgsrc/devel/gobject-introspection

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

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Wed Nov 16 16:08:34 UTC 2022

Modified Files:
        pkgsrc/devel/gobject-introspection: Makefile distinfo
        pkgsrc/devel/gobject-introspection/patches:
            patch-giscanner_ccompiler.py

Log Message:
gobject-introspection: Avoid -Wl,--no-as-needed on SunOS.

We currently prune this out in mk/platform but this ensures the installed files
do not contain it either.  Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.82 -r1.83 pkgsrc/devel/gobject-introspection/Makefile
cvs rdiff -u -r1.48 -r1.49 pkgsrc/devel/gobject-introspection/distinfo
cvs rdiff -u -r1.4 -r1.5 \
    pkgsrc/devel/gobject-introspection/patches/patch-giscanner_ccompiler.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/gobject-introspection/Makefile
diff -u pkgsrc/devel/gobject-introspection/Makefile:1.82 pkgsrc/devel/gobject-introspection/Makefile:1.83
--- pkgsrc/devel/gobject-introspection/Makefile:1.82    Thu Jun 30 11:18:14 2022
+++ pkgsrc/devel/gobject-introspection/Makefile Wed Nov 16 16:08:34 2022
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.82 2022/06/30 11:18:14 nia Exp $
+# $NetBSD: Makefile,v 1.83 2022/11/16 16:08:34 jperkin Exp $
 
 DISTNAME=      gobject-introspection-1.70.0
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=    devel gnome
 MASTER_SITES=  ${MASTER_SITE_GNOME:=sources/gobject-introspection/${PKGVERSION_NOREV:R}/}
 EXTRACT_SUFX=  .tar.xz

Index: pkgsrc/devel/gobject-introspection/distinfo
diff -u pkgsrc/devel/gobject-introspection/distinfo:1.48 pkgsrc/devel/gobject-introspection/distinfo:1.49
--- pkgsrc/devel/gobject-introspection/distinfo:1.48    Fri May 13 12:05:59 2022
+++ pkgsrc/devel/gobject-introspection/distinfo Wed Nov 16 16:08:34 2022
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.48 2022/05/13 12:05:59 tnn Exp $
+$NetBSD: distinfo,v 1.49 2022/11/16 16:08:34 jperkin Exp $
 
 BLAKE2s (gobject-introspection-1.70.0.tar.xz) = 079f927cf357bc24d4df1d8130c61b9a1f3e5249f53bcf7cfe9db0989e28a4ea
 SHA512 (gobject-introspection-1.70.0.tar.xz) = 216b376ed423f607e36c723dd6b67975dbfb63c253f2d8bd0b3661e3d69f8c8059cf221db8c5260b0262fad1b7d738f3b2e5fbd51fdbc31e40ccb115c209baf0
 Size (gobject-introspection-1.70.0.tar.xz) = 1029372 bytes
 SHA1 (patch-girepository_gitypelib.c) = b5fa0fe0fc22a5dfb2b2916dfbb87e16fc732640
 SHA1 (patch-giscanner_ast.py) = 06b3d8903d126028d2d5144c6d6a508209c834b9
-SHA1 (patch-giscanner_ccompiler.py) = f65622421968e9daef19bafc4bd3c3d210546389
+SHA1 (patch-giscanner_ccompiler.py) = c730488e66caf0bb2f258df04be66d72ca714ab4
 SHA1 (patch-giscanner_doctemplates_devdocs_meson.build) = d65e229db068a99ecf78e03ff0dfae809e731612
 SHA1 (patch-giscanner_doctemplates_mallard_meson.build) = 71e65065b66ae3e58d5212642ac284854da3c13d
 SHA1 (patch-giscanner_meson.build) = f3f482ef460ea725cb45f385cd09eaab5063c46d

Index: pkgsrc/devel/gobject-introspection/patches/patch-giscanner_ccompiler.py
diff -u pkgsrc/devel/gobject-introspection/patches/patch-giscanner_ccompiler.py:1.4 pkgsrc/devel/gobject-introspection/patches/patch-giscanner_ccompiler.py:1.5
--- pkgsrc/devel/gobject-introspection/patches/patch-giscanner_ccompiler.py:1.4 Mon Jan 11 19:15:24 2021
+++ pkgsrc/devel/gobject-introspection/patches/patch-giscanner_ccompiler.py     Wed Nov 16 16:08:34 2022
@@ -1,9 +1,19 @@
-$NetBSD: patch-giscanner_ccompiler.py,v 1.4 2021/01/11 19:15:24 jperkin Exp $
+$NetBSD: patch-giscanner_ccompiler.py,v 1.5 2022/11/16 16:08:34 jperkin Exp $
 
 Exclude system paths from LD_LIBRARY_PATH.
+Do not use -Wl,--no-as-needed on SunOS.
 
---- giscanner/ccompiler.py.orig        2020-10-03 10:23:41.768748500 +0000
+--- giscanner/ccompiler.py.orig        2021-09-17 16:02:42.520052200 +0000
 +++ giscanner/ccompiler.py
+@@ -197,7 +197,7 @@ class CCompiler(object):
+ 
+                 # Ensure libraries are always linked as we are going to use ldd to work
+                 # out their names later
+-                if sys.platform != 'darwin':
++                if sys.platform != 'darwin' and sys.platform != 'sunos5':
+                     args.append('-Wl,--no-as-needed')
+ 
+         for library_path in libpaths:
 @@ -215,7 +215,8 @@ class CCompiler(object):
                      else:
                          args.append('-Wl,-rpath,' + library_path)