more travis-trusty fix attempts

diff --git a/.travis.yml b/.travis.yml
index 559e2a12550b4cacaddb501d4dff765210e4108e..a97f7ef8c183ad55503046093d477675efd44845 100644 (file)
--- 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 f5c82c1c91350b27b038afb6035483ec23175848..df18db6d66fe51b29e28c0950f4df8067862e90b 100644 (file)
--- 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 e59fbefc3d6ece27d29021c3b7115bfb043d9868..bd2617b60e9cffc0ae8bcf7531ebbe6ed87f7930 100644 (file)
--- 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 61ada04bb65c7f0f41d9360c0ed8de1fff958d6c..19aa6cb951b02676eda1b74c3ba3ec99bec9c810 100644 (file)
--- 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 ef1ae8a5203c45a38376c9b62cc674ca115ab44b..0215066eade3cc987d775d3a775c3dd8de5af352 100755 (executable)
--- 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