CVS commit: pkgsrc/textproc/expat

["S.P.Zeidler" <spz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   spz
Date:           Tue Jun 20 18:31:36 UTC 2017

Modified Files:
        pkgsrc/textproc/expat: distinfo
        pkgsrc/textproc/expat/patches: patch-configure patch-configure.ac

Log Message:
build fix for OS X and Solaris from Tim Zingelman <tez%netbsd.org@localhost>:
OS X & Solaris have sys/random.h but not getrandom() so the build fails
with a missing symbol.                                                          Test linking the getrandom snippet instead of only compiling it
in configure.


To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 pkgsrc/textproc/expat/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/textproc/expat/patches/patch-configure \
    pkgsrc/textproc/expat/patches/patch-configure.ac

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

Modified files:

Index: pkgsrc/textproc/expat/distinfo
diff -u pkgsrc/textproc/expat/distinfo:1.27 pkgsrc/textproc/expat/distinfo:1.28
--- pkgsrc/textproc/expat/distinfo:1.27 Sun Jun 18 06:01:33 2017
+++ pkgsrc/textproc/expat/distinfo      Tue Jun 20 18:31:36 2017
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.27 2017/06/18 06:01:33 spz Exp $
+$NetBSD: distinfo,v 1.28 2017/06/20 18:31:36 spz Exp $
 
 SHA1 (expat-2.2.1.tar.bz2) = f45eb724f182776a9cacec9ed70d549e87198987
 RMD160 (expat-2.2.1.tar.bz2) = 3c8e8e8c73775706d88b4938f514d85b49eac182
 SHA512 (expat-2.2.1.tar.bz2) = 74089b55872df16f214a4baba0143e6353736dfa34063391293bb2760aa3e5118d9ccb3592e07c74c9d52a2a5b91496e15153f28214c4c01242d95b3019b67ea
 Size (expat-2.2.1.tar.bz2) = 405441 bytes
-SHA1 (patch-configure) = 172493bf45a5151f61db1b539d74259ef8986370
-SHA1 (patch-configure.ac) = 966e7143cf93b42eab396ae371ebbbd28bc4599c
+SHA1 (patch-configure) = 7efe7900bf6bcfa14e3bc296e2fa4b77f73266e3
+SHA1 (patch-configure.ac) = bb6cc261fa6368f005784b27284d658fa3597657

Index: pkgsrc/textproc/expat/patches/patch-configure
diff -u pkgsrc/textproc/expat/patches/patch-configure:1.1 pkgsrc/textproc/expat/patches/patch-configure:1.2
--- pkgsrc/textproc/expat/patches/patch-configure:1.1   Sun Jun 18 06:01:33 2017
+++ pkgsrc/textproc/expat/patches/patch-configure       Tue Jun 20 18:31:36 2017
@@ -1,7 +1,16 @@
-$NetBSD: patch-configure,v 1.1 2017/06/18 06:01:33 spz Exp $
+$NetBSD: patch-configure,v 1.2 2017/06/20 18:31:36 spz Exp $
 
 --- configure.orig     2017-06-17 18:21:24.000000000 +0000
 +++ configure
+@@ -16341,7 +16341,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_
+   }
+ 
+ _ACEOF
+-if ac_fn_c_try_compile "$LINENO"; then :
++if ac_fn_c_try_link "$LINENO"; then :
+ 
+ 
+ $as_echo "#define HAVE_GETRANDOM 1" >>confdefs.h
 @@ -16989,8 +16989,8 @@ fi
  
  if test "x${enable_xml_context}" != "xno"; then :
Index: pkgsrc/textproc/expat/patches/patch-configure.ac
diff -u pkgsrc/textproc/expat/patches/patch-configure.ac:1.1 pkgsrc/textproc/expat/patches/patch-configure.ac:1.2
--- pkgsrc/textproc/expat/patches/patch-configure.ac:1.1        Sun Jun 18 06:01:33 2017
+++ pkgsrc/textproc/expat/patches/patch-configure.ac    Tue Jun 20 18:31:36 2017
@@ -1,7 +1,16 @@
-$NetBSD: patch-configure.ac,v 1.1 2017/06/18 06:01:33 spz Exp $
+$NetBSD: patch-configure.ac,v 1.2 2017/06/20 18:31:36 spz Exp $
 
 --- configure.ac.orig  2017-06-17 16:07:38.000000000 +0000
 +++ configure.ac
+@@ -130,7 +130,7 @@ AC_LINK_IFELSE([AC_LANG_SOURCE([
+ 
+ 
+ AC_MSG_CHECKING([for getrandom (Linux 3.17+, glibc 2.25+)])
+-AC_COMPILE_IFELSE([AC_LANG_SOURCE([
++AC_LINK([AC_LANG_SOURCE([
+   #include <stdlib.h>  /* for NULL */
+   #include <sys/random.h>
+   int main() {
 @@ -220,8 +220,8 @@ AS_HELP_STRING([--disable-xml-context],
      [Do not retain context around the current parse point]),
    [enable_xml_context=${enableval}])