me
/
guix
Archived
1
0
Fork 0
Code

gnu: php: Fix typo. 

Regression introduced in e8cfce439a.

* gnu/packages/php.scm (php)[arguments]: Add missing 'else' branch of
the 'if'.  Change first argument to 'string-prefix?' to match GNU
triplets as well.
master
Ludovic Courtès 2019-03-29 15:34:37 +01:00
parent 46fc7cafcf
commit 9398152ad1
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gnu/packages/php.scm
View File

@ -182,8 +182,8 @@
(substitute* "ext/standard/tests/streams/bug60602.phpt"
(("'ls'") (string-append "'" (which "ls") "'")))
,@(if (string-prefix? "armhf" (or (%current-system)
(%current-target-system)))
,@(if (string-prefix? "arm" (or (%current-system)
(%current-target-system)))
;; Drop tests known to fail on armhf.
'((for-each delete-file
(list
@ -191,7 +191,8 @@
;; arm can be a lot slower, so a time-related test fails
"ext/fileinfo/tests/cve-2014-3538-nojit.phpt"
"ext/pcre/tests/bug76514.phpt"
"ext/pcre/tests/preg_match_error3.phpt"))))
"ext/pcre/tests/preg_match_error3.phpt")))
'())
;; Drop tests that are known to fail.
(for-each delete-file