diff options
| author | spz <spz@pkgsrc.org> | 2017-06-20 18:31:36 +0000 |
|---|---|---|
| committer | spz <spz@pkgsrc.org> | 2017-06-20 18:31:36 +0000 |
| commit | 9bf38774d7a1db9bd3aa1695e21738c084c871ed (patch) | |
| tree | 1417d5db695b4b865071e8671c4ec4a6d6efcbd3 /textproc/expat | |
| parent | 38d018311c262051bedf4915abc59c64dff32b8a (diff) | |
| download | pkgsrc-9bf38774d7a1db9bd3aa1695e21738c084c871ed.tar.gz | |
build fix for OS X and Solaris from Tim Zingelman <tez@netbsd.org>:
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.
Diffstat (limited to 'textproc/expat')
| -rw-r--r-- | textproc/expat/distinfo | 6 | ||||
| -rw-r--r-- | textproc/expat/patches/patch-configure | 11 | ||||
| -rw-r--r-- | textproc/expat/patches/patch-configure.ac | 11 |
3 files changed, 23 insertions, 5 deletions
diff --git a/textproc/expat/distinfo b/textproc/expat/distinfo index 20e576c0d40..34fc48e1662 100644 --- a/textproc/expat/distinfo +++ b/textproc/expat/distinfo @@ -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 diff --git a/textproc/expat/patches/patch-configure b/textproc/expat/patches/patch-configure index 6ab9a23711b..a1eb5f0eba8 100644 --- a/textproc/expat/patches/patch-configure +++ b/textproc/expat/patches/patch-configure @@ -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 : diff --git a/textproc/expat/patches/patch-configure.ac b/textproc/expat/patches/patch-configure.ac index cbf3a2868f4..113ddc94a84 100644 --- a/textproc/expat/patches/patch-configure.ac +++ b/textproc/expat/patches/patch-configure.ac @@ -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}]) |