Re: pkg/54298: devel/glib2 fails to build

[Patrick Welche <prlw1%cam.ac.uk@localhost>]

The following reply was made to PR pkg/54298; it has been noted by GNATS.

From: Patrick Welche <prlw1%cam.ac.uk@localhost>
To: gnats-bugs%netbsd.org@localhost
Cc: 
Subject: Re: pkg/54298: devel/glib2 fails to build
Date: Tue, 25 Jun 2019 12:22:52 +0100

 Does this help?
 
 Index: distinfo
 ===================================================================
 RCS file: /cvsroot/pkgsrc/devel/glib2/distinfo,v
 retrieving revision 1.249
 diff -u -r1.249 distinfo
 --- distinfo	25 Jun 2019 10:57:28 -0000	1.249
 +++ distinfo	25 Jun 2019 11:20:59 -0000
 @@ -26,4 +26,4 @@
  SHA1 (patch-gmodule_gmodule.c) = 55c5f9d16e3517f3fdc04d40922f50d9c66b0b9a
  SHA1 (patch-gobject_glib-mkenums.in) = c177cf9b1ea81542665240678f47f68351a3760d
  SHA1 (patch-gobject_meson.build) = 58ee162e44047bf20c66067fd3edbe98cc13af50
 -SHA1 (patch-meson.build) = ce24f19714f6d78d1be9ecd6802f6c25a086c8e8
 +SHA1 (patch-meson.build) = c73d83cc9f717bdafd693685168990dc8eaf6b2a
 Index: patches/patch-meson.build
 ===================================================================
 RCS file: /cvsroot/pkgsrc/devel/glib2/patches/patch-meson.build,v
 retrieving revision 1.4
 diff -u -r1.4 patch-meson.build
 --- patches/patch-meson.build	18 Jun 2019 13:05:14 -0000	1.4
 +++ patches/patch-meson.build	25 Jun 2019 11:20:59 -0000
 @@ -1,19 +1,34 @@
 -$NetBSD: patch-meson.build,v 1.4 2019/06/18 13:05:14 jperkin Exp $
 +$NetBSD$
  
  - Don't insist that python binary is called "python3".
    (Requires meson >= 0.50.0)
  - Don't install bash completion scripts.
  
  - Tolerate getxattr not existing (smartOS)
 -https://gitlab.gnome.org/GNOME/glib/merge_requests/888
 +  https://gitlab.gnome.org/GNOME/glib/merge_requests/888
  
  - Define a newer POSIX, as we build this package with -std=gnu99
  - auto-detect GNU iconv, even if no arguments are passed.
    (by checking if iconv.h might in fact be a gnu one)
  
 +- Don't restrict lack of __GCC_HAVE_SYNC_COMPARE_AND_SWAP_4
 +  fix to android and linux. PR pkg/54298
 +
  --- meson.build.orig	2019-06-10 17:47:20.000000000 +0000
  +++ meson.build
 -@@ -1696,14 +1696,14 @@ else
 +@@ -1579,10 +1579,7 @@ atomicdefine = '''
 + # We know that we can always use real ("lock free") atomic operations with MSVC
 + if cc.get_id() == 'msvc' or cc.links(atomictest, name : 'atomic ops')
 +   have_atomic_lock_free = true
 +-  if (host_system == 'android' or host_system == 'linux') and not cc.compiles(atomicdefine, name : 'atomic ops define')
 +-    # When building for armv5 on Linux, gcc provides
 +-    # __sync_bool_compare_and_swap but doesn't define
 +-    # __GCC_HAVE_SYNC_COMPARE_AND_SWAP_4
 ++  if not cc.compiles(atomicdefine, name : 'atomic ops define')
 +     glib_conf.set('__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4', true)
 +   endif
 + else
 +@@ -1696,14 +1693,14 @@ else
     found_iconv = false
     if iconv_opt == 'libc'
       if cc.has_function('iconv_open')
 @@ -36,7 +51,7 @@
       endif
     elif iconv_opt == 'native'
       if cc.has_header_symbol('iconv.h', 'iconv_open')
 -@@ -1785,7 +1785,7 @@ endif
 +@@ -1785,7 +1782,7 @@ endif
   # proxy-libintl subproject.
   # FIXME: glib-gettext.m4 has much more checks to detect broken/uncompatible
   # implementations. This could be extended if issues are found in some platforms.
 @@ -45,7 +60,7 @@
     libintl = []
     have_bind_textdomain_codeset = cc.has_function('bind_textdomain_codeset')
   else
 -@@ -1836,16 +1836,15 @@ if host_system != 'windows' and get_opti
 +@@ -1836,16 +1833,15 @@ if host_system != 'windows' and get_opti
     if cc.has_function('getxattr') and cc.has_header('sys/xattr.h')
       glib_conf.set('HAVE_SYS_XATTR_H', 1)
       glib_conf_prefix = glib_conf_prefix + '#define @0@ 1\n'.format('HAVE_SYS_XATTR_H')
 @@ -64,7 +79,7 @@
     if cc.compiles(glib_conf_prefix + '''
                    #include <stdio.h>
                    #ifdef HAVE_SYS_TYPES_H
 -@@ -1886,9 +1885,11 @@ elif meson.get_cross_property('have_strl
 +@@ -1886,9 +1882,11 @@ elif meson.get_cross_property('have_strl
     glib_conf.set('HAVE_STRLCPY', 1)
   endif
   
 @@ -79,7 +94,7 @@
   
   python_version = python.language_version()
   python_version_req = '>=3.4'
 -@@ -1897,7 +1898,7 @@ if not python_version.version_compare(py
 +@@ -1897,7 +1895,7 @@ if not python_version.version_compare(py
   endif
   
   # Determine which user environment-dependent files that we want to install
 @@ -88,7 +103,7 @@
   have_sh = find_program('sh', required : false).found() # For glib-gettextize
   
   # Some installed tests require a custom environment
 -@@ -1906,7 +1907,7 @@ env_program = find_program('env', requir
 +@@ -1906,7 +1904,7 @@ env_program = find_program('env', requir
   # FIXME: How to detect Solaris? https://github.com/mesonbuild/meson/issues/1578
   if host_system == 'sunos'
     glib_conf.set('_XOPEN_SOURCE_EXTENDED', 1)