From: Michael Wallner <mike@php.net>
Date: Tue, 18 Oct 2016 13:39:32 +0000 (+0000)
Subject: more travis-trusty fix attempts
X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-psi;a=commitdiff_plain;h=a78817d6e2da0be5942dd8e1d334789e9e88ffa3

more travis-trusty fix attempts
---

diff --git a/.travis.yml b/.travis.yml
index 559e2a1..a97f7ef 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,6 @@
 # autogenerated file; do not edit
 language: c
-sudo: required
-dist: trusty
+sudo: false
 
 addons:
  apt:
@@ -26,3 +25,5 @@ before_script:
 script:
  - make -f travis/pecl/Makefile test
 
+after_failure:
+ - cat config.log
diff --git a/config.m4 b/config.m4
index f5c82c1..df18db6 100644
--- a/config.m4
+++ b/config.m4
@@ -57,14 +57,17 @@ PHP_ARG_WITH(psi-libffi, where to find libffi,
 
 if test "$PHP_PSI" != no; then
 	PHP_CONFIGURE_PART(Configuring PSI)
-	
+
+	save_LIBS=$LIBS
+	LIBS=
+
 	PSI_LEMON
 	PSI_CHECK_LIBJIT
 	PSI_CHECK_LIBFFI
 
 	AC_PATH_PROG(NM, nm)
 	AC_FUNC_FNMATCH
-	
+
 	PSI_CONFIG_INIT
 	PSI_CHECK_STD_TYPES
 	PSI_CHECK_STDINT
@@ -96,6 +99,9 @@ if test "$PHP_PSI" != no; then
 	PSI_CHECK_WCTYPE
 	PSI_CONFIG_DONE
 
+	eval_LIBS=$LIBS
+	LIBS=$save_LIBS
+	PHP_EVAL_LIBLINE($eval_LIBS, PSI_SHARED_LIBADD)
 	PHP_SUBST(PSI_SHARED_LIBADD)
 
 	AC_DEFINE_UNQUOTED(PHP_PSI_SHLIB_SUFFIX, ["$SHLIB_SUFFIX_NAME"], DL suffix)
diff --git a/m4/posix/ndbm.m4 b/m4/posix/ndbm.m4
index e59fbef..bd2617b 100644
--- a/m4/posix/ndbm.m4
+++ b/m4/posix/ndbm.m4
@@ -1,7 +1,7 @@
 PSI_CHECK_NDBM() {
 	PSI_CONFIG_POSIX(ndbm, ndbm.h gdbm-ndbm.h)
 
-	PHP_CHECK_FUNC_LIB(dbm_open, gdbm_compat)
+	PHP_CHECK_FUNC(dbm_open, gdbm_compat)
 
 	PSI_STRUCT(datum, [
 		void *dptr,
diff --git a/psi.d/glob.psi b/psi.d/glob.psi
index 61ada04..19aa6cb 100644
--- a/psi.d/glob.psi
+++ b/psi.d/glob.psi
@@ -2,8 +2,8 @@ function psi\glob(string $pattern, int $flags, array &$glob = NULL, callable $er
 	let path = strval($pattern);
 	let flags = intval($flags);
 	let err = callback intval($errfn(
-		to_string(errmsg),
-		to_int(errno)
+		to_string(epath),
+		to_int(eerrno)
 	));
 	let buf = &arrval($glob);
 	return to_int(glob);
diff --git a/scripts/gen_travis_yml.php b/scripts/gen_travis_yml.php
index ef1ae8a..0215066 100755
--- a/scripts/gen_travis_yml.php
+++ b/scripts/gen_travis_yml.php
@@ -1,8 +1,7 @@
 #!/usr/bin/env php
 # autogenerated file; do not edit
 language: c
-sudo: required
-dist: trusty
+sudo: false
 
 addons:
  apt:
@@ -36,3 +35,5 @@ before_script:
 script:
  - make -f travis/pecl/Makefile test
 
+after_failure:
+ - cat config.log