diff options
| author | Ferenc Kovacs <tyrael@php.net> | 2015-10-19 22:47:23 +0200 |
|---|---|---|
| committer | Ferenc Kovacs <tyrael@php.net> | 2015-10-19 22:47:23 +0200 |
| commit | 395ef4efb72aab6a660612be4632794f00991d85 (patch) | |
| tree | 0ca7d83cf49160e0c870f5290c3a445d95801f05 /travis/compile.sh | |
| parent | 0b35e0c5a120c9ff98dad7e44259f26ca828a8e4 (diff) | |
| parent | f3838a9c3561022cfeeb649093e4fdec715d39b0 (diff) | |
| download | php-git-395ef4efb72aab6a660612be4632794f00991d85.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
fixup, both catched by nikic
use another character device in this test as /dev/console seems that it is different for lxc containers
the de_DE(iso-8859-1) locale is not available on ubuntu by default, but there is no reason to require that over the utf-8 one
let's try running our testsuite without sudo
Diffstat (limited to 'travis/compile.sh')
| -rwxr-xr-x | travis/compile.sh | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/travis/compile.sh b/travis/compile.sh index 4dce7fc8a4..fa0a2fcfa1 100755 --- a/travis/compile.sh +++ b/travis/compile.sh @@ -10,7 +10,9 @@ else DEBUG=""; fi ./buildconf --force -./configure --quiet \ +./configure \ +--prefix=$HOME"/php-install" \ +--quiet \ $DEBUG \ $TS \ --enable-fpm \ @@ -58,4 +60,4 @@ $TS \ --enable-wddx \ --enable-sysvmsg make -j2 --quiet -sudo make install +make install |