Re: CVS commit: pkgsrc/devel/glib2

[Leonardo Taccari <leot%NetBSD.org@localhost>]

Hello Ryo,

Ryo ONODERA writes:
> [...]
> Modified Files:
>       pkgsrc/devel/glib2: Makefile distinfo
>       pkgsrc/devel/glib2/patches: patch-gio_meson.build
>           patch-glib_meson.build patch-gobject_meson.build
> Added Files:
>       pkgsrc/devel/glib2/patches: patch-gmodule_meson.build
>           patch-gthread_meson.build
>
> Log Message:
> Include rpath flags to ldflags, Bump PKGREVISION
>
> This is workaround and should be fixed with more generic approach.
> Outside pkgsrc, this may not work properly.
> [...]

Couldn't PKGCONFIG_OVERRIDE and PKGCONFIG_OVERRIDE_STAGE be used
instead? (pkg.generate() generate the `.pc' files during configure
stage so just using `post-configure' for PKGCONFIG_OVERRIDE_STAGE do
the same)

Apart the `-rpath' -> `-R' change the resulting .pc files are the
same after applying the attached patch.

Please let me know if it looks good and I'll commit it (or feel free to
beat me!).


Thank you!

Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/devel/glib2/Makefile,v
retrieving revision 1.252
diff -u -p -r1.252 Makefile
--- Makefile    16 Jun 2019 01:54:40 -0000      1.252
+++ Makefile    16 Jun 2019 07:47:17 -0000
@@ -46,6 +46,17 @@ SUBST_SED.xdg=               -e 's,/usr/local/share/:
 SUBST_SED.xdg+=                -e 's,/etc/xdg,${PKG_SYSCONFDIR}/xdg,'
 SUBST_SED.xdg+=                -e 's,/usr/share/locale,${PREFIX}/${PKGLOCALEDIR}/locale,'
 
+PKGCONFIG_OVERRIDE+=   output/meson-private/gio-2.0.pc
+PKGCONFIG_OVERRIDE+=   output/meson-private/gio-unix-2.0.pc
+PKGCONFIG_OVERRIDE+=   output/meson-private/glib-2.0.pc
+PKGCONFIG_OVERRIDE+=   output/meson-private/gmodule-2.0.pc
+PKGCONFIG_OVERRIDE+=   output/meson-private/gmodule-export-2.0.pc
+PKGCONFIG_OVERRIDE+=   output/meson-private/gmodule-no-export-2.0.pc
+PKGCONFIG_OVERRIDE+=   output/meson-private/gobject-2.0.pc
+PKGCONFIG_OVERRIDE+=   output/meson-private/gthread-2.0.pc
+
+PKGCONFIG_OVERRIDE_STAGE=      post-configure
+
 # to run gdbus-codegen to generate gdbus-daemon-generated.{h,c}
 TOOL_DEPENDS+=         ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat
 PYTHON_FOR_BUILD_ONLY= yes
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/devel/glib2/distinfo,v
retrieving revision 1.245
diff -u -p -r1.245 distinfo
--- distinfo    16 Jun 2019 01:54:40 -0000      1.245
+++ distinfo    16 Jun 2019 07:47:17 -0000
@@ -11,16 +11,14 @@ SHA1 (patch-gio_gresource-tool.c) = ad0e
 SHA1 (patch-gio_gunixcredentialsmessage.c) = c13119ddd6262db7c03e53857e987f0c495d3312
 SHA1 (patch-gio_gunixmounts.c) = 13af07fffe898457edd0d8db4296a60fccba913d
 SHA1 (patch-gio_inotify_inotify-kernel.c) = 24deec33a1ad5e3c1a4f2d1397440d26b0f23b84
-SHA1 (patch-gio_meson.build) = 6382404cda6ca64eac9d5ecee2fde02bd6d93af9
+SHA1 (patch-gio_meson.build) = a0dcda4e9d05ed83b7fb11102945821eea27b81d
 SHA1 (patch-glib_gmain.c) = 2ab4b59e438d9f764bee62e0c1fa8bbd231b6e8d
-SHA1 (patch-glib_meson.build) = 50f7b7dd8e003d1dfd445ba0f515ba51d843e412
+SHA1 (patch-glib_meson.build) = 119e48efd8aaabf06b62c6e1897261b470cf7355
 SHA1 (patch-gmodule_gmodule-ar.c) = e382a0ada232e083d51cbede7f689a50ebeff4d8
 SHA1 (patch-gmodule_gmodule-dl.c) = b678a04debbc79ebb67d91db7716990658e76da4
 SHA1 (patch-gmodule_gmodule-dyld.c) = 5adf62970d9cff22d451307aaa0b00d975dab138
 SHA1 (patch-gmodule_gmodule-win32.c) = 477a861f8590a62c3dbc0aa4ad728cc86ebb34dd
 SHA1 (patch-gmodule_gmodule.c) = 55c5f9d16e3517f3fdc04d40922f50d9c66b0b9a
-SHA1 (patch-gmodule_meson.build) = 23ab3a2e3bf460469b8a9ee2221b50b0953f7de1
 SHA1 (patch-gobject_glib-mkenums.in) = c177cf9b1ea81542665240678f47f68351a3760d
-SHA1 (patch-gobject_meson.build) = 611a04e63df509ae1dd1aa0d83e1e2fb6fe3629a
-SHA1 (patch-gthread_meson.build) = 0c58eaed83b8b29169760e5b811d35b509320549
+SHA1 (patch-gobject_meson.build) = 58ee162e44047bf20c66067fd3edbe98cc13af50
 SHA1 (patch-meson.build) = b2e1139f4606870b117fd6ff35d7832b35ea1126
Index: patches/patch-gio_meson.build
===================================================================
RCS file: /cvsroot/pkgsrc/devel/glib2/patches/patch-gio_meson.build,v
retrieving revision 1.3
diff -u -p -r1.3 patch-gio_meson.build
--- patches/patch-gio_meson.build       16 Jun 2019 01:54:40 -0000      1.3
+++ patches/patch-gio_meson.build       16 Jun 2019 07:47:17 -0000
@@ -14,14 +14,6 @@ Disable inotify on SunOS.
    subdir('inotify')
    internal_deps += [ inotify_lib ]
    internal_objects += [inotify_lib.extract_all_objects()]
-@@ -823,6 +823,7 @@ endif
- schemas_subdir = join_paths('glib-2.0', 'schemas')
- 
- pkg.generate(libgio,
-+  libraries : ['-Wl,-rpath${libdir}'],
-   libraries_private : [osx_ldflags],
-   requires : ['glib-2.0', 'gobject-2.0'],
-   variables : ['datadir=' + join_paths('${prefix}', get_option('datadir')),
 @@ -994,4 +995,3 @@ if enable_systemtap
  endif
  
Index: patches/patch-glib_meson.build
===================================================================
RCS file: /cvsroot/pkgsrc/devel/glib2/patches/patch-glib_meson.build,v
retrieving revision 1.2
diff -u -p -r1.2 patch-glib_meson.build
--- patches/patch-glib_meson.build      16 Jun 2019 01:54:40 -0000      1.2
+++ patches/patch-glib_meson.build      16 Jun 2019 07:47:17 -0000
@@ -6,15 +6,6 @@ $NetBSD: patch-glib_meson.build,v 1.2 20
 
 --- glib/meson.build.orig      2019-06-10 17:47:20.000000000 +0000
 +++ glib/meson.build
-@@ -284,7 +284,7 @@ libglib_dep = declare_dependency(
-   include_directories : [configinc, glibinc])
- 
- pkg.generate(libglib,
--  libraries : [libintl],
-+  libraries : [libintl, '-Wl,-rpath${libdir}'],
-   libraries_private : [osx_ldflags, win32_ldflags],
-   subdirs : ['glib-2.0'],
-   extra_cflags : ['-I${libdir}/glib-2.0/include'] + win32_cflags,
 @@ -324,24 +324,8 @@ if host_system == 'windows'
        include_directories : configinc,
        dependencies : [libglib_dep])
Index: patches/patch-gmodule_meson.build
===================================================================
RCS file: patches/patch-gmodule_meson.build
diff -N patches/patch-gmodule_meson.build
--- patches/patch-gmodule_meson.build   16 Jun 2019 01:54:40 -0000      1.1
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,13 +0,0 @@
-$NetBSD: patch-gmodule_meson.build,v 1.1 2019/06/16 01:54:40 ryoon Exp $
-
---- gmodule/meson.build.orig   2019-06-10 17:47:20.000000000 +0000
-+++ gmodule/meson.build
-@@ -110,7 +110,7 @@ libgmodule = library('gmodule-2.0',
- supported_var = 'gmodule_supported=@0@'.format(g_module_impl != '0')
- 
- pkg.generate(libgmodule,
--  libraries : [thread_dep],
-+  libraries : [thread_dep, '-Wl,-rpath${libdir}'],
-   requires : ['glib-2.0'],
-   version : glib_version,
-   variables : [supported_var],
Index: patches/patch-gobject_meson.build
===================================================================
RCS file: /cvsroot/pkgsrc/devel/glib2/patches/patch-gobject_meson.build,v
retrieving revision 1.2
diff -u -p -r1.2 patch-gobject_meson.build
--- patches/patch-gobject_meson.build   16 Jun 2019 01:54:40 -0000      1.2
+++ patches/patch-gobject_meson.build   16 Jun 2019 07:47:17 -0000
@@ -13,11 +13,3 @@ Leave glib-genmarshal and glib-mkenums t
      install_dir : glib_bindir,
    )
  
-@@ -132,6 +132,7 @@ libgobject = library('gobject-2.0',
- )
- 
- pkg.generate(libgobject,
-+  libraries: ['-Wl,-rpath${libdir}'],
-   requires : ['glib-2.0'],
-   version : glib_version,
-   install_dir : glib_pkgconfigreldir,
Index: patches/patch-gthread_meson.build
===================================================================
RCS file: patches/patch-gthread_meson.build
diff -N patches/patch-gthread_meson.build
--- patches/patch-gthread_meson.build   16 Jun 2019 01:54:40 -0000      1.1
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,13 +0,0 @@
-$NetBSD: patch-gthread_meson.build,v 1.1 2019/06/16 01:54:40 ryoon Exp $
-
---- gthread/meson.build.orig   2019-06-10 17:47:20.000000000 +0000
-+++ gthread/meson.build
-@@ -24,7 +24,7 @@ libgthread = library('gthread-2.0',
- )
- 
- pkg.generate(libgthread,
--  libraries : [thread_dep],
-+  libraries : [thread_dep, '-Wl,-rpath${libdir}'],
-   requires : ['glib-2.0'],
-   version : glib_version,
-   install_dir : glib_pkgconfigreldir,