* [bug#33706] [PATCH] gnu: php: Update to 7.3.0.
@ 2018-12-11 16:42 Oleg Pykhalov
2018-12-11 20:25 ` Julien Lepiller
0 siblings, 1 reply; 4+ messages in thread
From: Oleg Pykhalov @ 2018-12-11 16:42 UTC (permalink / raw)
To: 33706
* gnu/packages/php.scm (php)[version]: Update to 7.3.0.
[arguments]: Delete "sapi/cli/tests/upload_2G.phpt" substitution and
delete "ext/pcre/tests/bug76909.phpt" file.
[inputs]: Replace 'pcre' with 'pcre2'.
---
gnu/packages/php.scm | 17 +++++++----------
1 file changed, 7 insertions(+), 10 deletions(-)
diff --git a/gnu/packages/php.scm b/gnu/packages/php.scm
index a28cb31e5..491e08481 100644
--- a/gnu/packages/php.scm
+++ b/gnu/packages/php.scm
@@ -53,7 +53,7 @@
(define-public php
(package
(name "php")
- (version "7.2.12")
+ (version "7.3.0")
(home-page "https://secure.php.net/")
(source (origin
(method url-fetch)
@@ -61,7 +61,7 @@
name "-" version ".tar.xz"))
(sha256
(base32
- "1qbz2j9kzqxxp0mmx02zavvz20ji7izqdnri25g1mrwyhz60974q"))
+ "1db0lm84hynilrjj3k1s7skp1y2gl4ip1ihr7662i2xgannmq6bx"))
(modules '((guix build utils)))
(snippet
'(with-directory-excursion "ext"
@@ -74,7 +74,6 @@
;;"fileinfo/libmagic" ; This is a patched version of libmagic.
'("gd/libgd"
"mbstring/oniguruma"
- "pcre/pcrelib"
"sqlite3/libsqlite"
"xmlrpc/libxmlrpc"
"zip/lib"))
@@ -176,11 +175,6 @@
(substitute* "ext/standard/tests/streams/bug60602.phpt"
(("'ls'") (string-append "'" (which "ls") "'")))
- ;; The expected output is slightly different from what is given,
- ;; in a section that's not related to the actual test
- (substitute* "sapi/cli/tests/upload_2G.phpt"
- (("Test\\\\n") "Test\n\n"))
-
;; Drop tests that are known to fail.
(for-each delete-file
'("ext/posix/tests/posix_getgrgid.phpt" ; Requires /etc/group.
@@ -291,7 +285,10 @@
"ext/ldap/tests/ldap_set_option_error.phpt"
;; Sometimes cannot start the LDAP server.
- "ext/ldap/tests/bug76248.phpt"))
+ "ext/ldap/tests/bug76248.phpt"
+
+ ;; Bug #76909 preg_match difference between 7.3 and < 7.3
+ "ext/pcre/tests/bug76909.phpt"))
;; Skip tests requiring network access.
(setenv "SKIP_ONLINE_TESTS" "1")
@@ -324,7 +321,7 @@
("oniguruma" ,oniguruma-5)
("openldap" ,openldap)
("openssl" ,openssl)
- ("pcre" ,pcre)
+ ("pcre" ,pcre2)
("postgresql" ,postgresql)
("readline" ,readline)
("sqlite" ,sqlite)
--
2.19.1
^ permalink raw reply related [flat|nested] 4+ messages in thread* [bug#33706] [PATCH] gnu: php: Update to 7.3.0.
2018-12-11 16:42 [bug#33706] [PATCH] gnu: php: Update to 7.3.0 Oleg Pykhalov
@ 2018-12-11 20:25 ` Julien Lepiller
2018-12-12 3:04 ` Oleg Pykhalov
0 siblings, 1 reply; 4+ messages in thread
From: Julien Lepiller @ 2018-12-11 20:25 UTC (permalink / raw)
To: Oleg Pykhalov, 33706
Hi,
Thanks for the patch! I haven't tested it yet, but I was wondering why update pcre to pcre2 while not stripping pcrelib anymore. Is thc directory not available anymore?
Le 11 décembre 2018 17:42:14 GMT+01:00, Oleg Pykhalov <go.wigust@gmail.com> a écrit :
>* gnu/packages/php.scm (php)[version]: Update to 7.3.0.
>[arguments]: Delete "sapi/cli/tests/upload_2G.phpt" substitution and
>delete "ext/pcre/tests/bug76909.phpt" file.
>[inputs]: Replace 'pcre' with 'pcre2'.
>---
> gnu/packages/php.scm | 17 +++++++----------
> 1 file changed, 7 insertions(+), 10 deletions(-)
>
>diff --git a/gnu/packages/php.scm b/gnu/packages/php.scm
>index a28cb31e5..491e08481 100644
>--- a/gnu/packages/php.scm
>+++ b/gnu/packages/php.scm
>@@ -53,7 +53,7 @@
> (define-public php
> (package
> (name "php")
>- (version "7.2.12")
>+ (version "7.3.0")
> (home-page "https://secure.php.net/")
> (source (origin
> (method url-fetch)
>@@ -61,7 +61,7 @@
> name "-" version ".tar.xz"))
> (sha256
> (base32
>-
>"1qbz2j9kzqxxp0mmx02zavvz20ji7izqdnri25g1mrwyhz60974q"))
>+
>"1db0lm84hynilrjj3k1s7skp1y2gl4ip1ihr7662i2xgannmq6bx"))
> (modules '((guix build utils)))
> (snippet
> '(with-directory-excursion "ext"
>@@ -74,7 +74,6 @@
> ;;"fileinfo/libmagic" ; This is a patched version of libmagic.
> '("gd/libgd"
> "mbstring/oniguruma"
>- "pcre/pcrelib"
> "sqlite3/libsqlite"
> "xmlrpc/libxmlrpc"
> "zip/lib"))
>@@ -176,11 +175,6 @@
> (substitute* "ext/standard/tests/streams/bug60602.phpt"
> (("'ls'") (string-append "'" (which "ls") "'")))
>
>- ;; The expected output is slightly different from what is
>given,
>- ;; in a section that's not related to the actual test
>- (substitute* "sapi/cli/tests/upload_2G.phpt"
>- (("Test\\\\n") "Test\n\n"))
>-
> ;; Drop tests that are known to fail.
> (for-each delete-file
> '("ext/posix/tests/posix_getgrgid.phpt" ; Requires /etc/group.
>@@ -291,7 +285,10 @@
> "ext/ldap/tests/ldap_set_option_error.phpt"
>
> ;; Sometimes cannot start the LDAP server.
>- "ext/ldap/tests/bug76248.phpt"))
>+ "ext/ldap/tests/bug76248.phpt"
>+
>+ ;; Bug #76909 preg_match difference between
>7.3 and < 7.3
>+ "ext/pcre/tests/bug76909.phpt"))
>
> ;; Skip tests requiring network access.
> (setenv "SKIP_ONLINE_TESTS" "1")
>@@ -324,7 +321,7 @@
> ("oniguruma" ,oniguruma-5)
> ("openldap" ,openldap)
> ("openssl" ,openssl)
>- ("pcre" ,pcre)
>+ ("pcre" ,pcre2)
> ("postgresql" ,postgresql)
> ("readline" ,readline)
> ("sqlite" ,sqlite)
^ permalink raw reply [flat|nested] 4+ messages in thread* [bug#33706] [PATCH] gnu: php: Update to 7.3.0.
2018-12-11 20:25 ` Julien Lepiller
@ 2018-12-12 3:04 ` Oleg Pykhalov
2018-12-13 3:01 ` Oleg Pykhalov
0 siblings, 1 reply; 4+ messages in thread
From: Oleg Pykhalov @ 2018-12-12 3:04 UTC (permalink / raw)
To: Julien Lepiller; +Cc: 33706
[-- Attachment #1.1: Type: text/plain, Size: 2104 bytes --]
Hi Julien,
Julien Lepiller <julien@lepiller.eu> writes:
> Thanks for the patch! I haven't tested it yet, but I was wondering why
> update pcre to pcre2 while not stripping pcrelib anymore. Is thc
> directory not available anymore?
Yes, the directory is not available:
--8<---------------cut here---------------start------------->8---
source is under 'php-7.3.0'
Backtrace:
10 (primitive-load "/gnu/store/rplv70ijk2djwhg35gwkaiz2llg?")
In ice-9/eval.scm:
619:8 9 (_ #(#<directory (guile-user) 5ce140> "php-7.3.0"))
293:34 8 (_ #(#<directory (guile-user) 5ce140> "php-7.3.0"))
In system/base/compile.scm:
255:6 7 (compile _ #:from _ #:to _ #:env _ #:opts _)
183:32 6 (compile-fold _ (with-directory-excursion "ext" (# ?) ?) ?)
In ice-9/boot-9.scm:
2312:4 5 (save-module-excursion #<procedure bba140 at language/b?>)
In language/bytecode/spec.scm:
35:19 4 (_)
In /gnu/store/rplv70ijk2djwhg35gwkaiz2llg5677i-php-7.3.0.tar.xz-builder:
1:2017 3 (_)
In ice-9/boot-9.scm:
260:13 2 (for-each #<procedure delete-file-recursively (dir #:k?> ?)
In guix/build/utils.scm:
340:23 1 (delete-file-recursively "pcre/pcrelib" #:follow-mounts? ?)
In unknown file:
0 (lstat "pcre/pcrelib")
ERROR: In procedure lstat:
In procedure lstat: No such file or directory: "pcre/pcrelib"
builder for `/gnu/store/mmk3rf1vfnbzfkk4hwkwswmkf66h23z0-php-7.3.0.tar.xz.drv' failed with exit code 1
build of /gnu/store/mmk3rf1vfnbzfkk4hwkwswmkf66h23z0-php-7.3.0.tar.xz.drv failed
View build log at '/var/log/guix/drvs/mm/k3rf1vfnbzfkk4hwkwswmkf66h23z0-php-7.3.0.tar.xz.drv.gz'.
cannot build derivation `/gnu/store/h4fc9f0p5408vh4d9kcv2jamymfz0qss-php-7.3.0.drv': 1 dependencies couldn't be built
guix build: error: build failed: build of `/gnu/store/h4fc9f0p5408vh4d9kcv2jamymfz0qss-php-7.3.0.drv' failed
Build step 'Execute shell' marked build as failure
Finished: FAILURE
--8<---------------cut here---------------end--------------->8---
I've found "pcre/pcre2lib" which is probably a renamed "pcre/pcrelib"
directory. I succeeded to build and run with a following change.
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.2: Delete 'pcre/pcre2lib' directory. --]
[-- Type: text/x-patch, Size: 540 bytes --]
diff --git a/gnu/packages/php.scm b/gnu/packages/php.scm
index 491e08481..dfb9f2db3 100644
--- a/gnu/packages/php.scm
+++ b/gnu/packages/php.scm
@@ -74,6 +74,7 @@
;;"fileinfo/libmagic" ; This is a patched version of libmagic.
'("gd/libgd"
"mbstring/oniguruma"
+ "pcre/pcre2lib"
"sqlite3/libsqlite"
"xmlrpc/libxmlrpc"
"zip/lib"))
[-- Attachment #1.3: Type: text/plain, Size: 233 bytes --]
--8<---------------cut here---------------start------------->8---
$ /gnu/store/bphw93wrikc275maaqclm04mglrvkzqh-php-7.3.0/bin/php -r 'print("hello");'
--8<---------------cut here---------------end--------------->8---
Thanks,
Oleg.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2018-12-13 3:02 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-12-11 16:42 [bug#33706] [PATCH] gnu: php: Update to 7.3.0 Oleg Pykhalov
2018-12-11 20:25 ` Julien Lepiller
2018-12-12 3:04 ` Oleg Pykhalov
2018-12-13 3:01 ` Oleg Pykhalov
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).