[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
02/02: gnu: php: Fix typo.
From: |
guix-commits |
Subject: |
02/02: gnu: php: Fix typo. |
Date: |
Fri, 29 Mar 2019 10:36:03 -0400 (EDT) |
civodul pushed a commit to branch master
in repository guix.
commit 9398152ad1f4e130ad895c8bb756de8a33e91f7f
Author: Ludovic Courtès <address@hidden>
Date: Fri Mar 29 15:34:37 2019 +0100
gnu: php: Fix typo.
Regression introduced in e8cfce439afed945e352ad28f73f0a5f7840f503.
* 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.
---
gnu/packages/php.scm | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/php.scm b/gnu/packages/php.scm
index ffb81da..ea002f8 100644
--- a/gnu/packages/php.scm
+++ b/gnu/packages/php.scm
@@ -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