From mboxrd@z Thu Jan 1 00:00:00 1970 From: Marius Bakke Subject: Re: [PATCH] Add php Date: Thu, 17 Nov 2016 01:01:10 +0100 Message-ID: <87h977c6ux.fsf@kirby.i-did-not-set--mail-host-address--so-tickle-me> References: <20161030130828.3797d37d@polymos.lepiller.eu> <20161030175105.1f6eeff2@polymos.lepiller.eu> <87ins9s9y1.fsf@duckhunt.i-did-not-set--mail-host-address--so-tickle-me> <20161102224052.7ec98d2d@lepiller.eu> <87eg2k8xp2.fsf@gnu.org> <20161111173123.51375f43@polymos.lepiller.eu> <87eg2etms7.fsf@kirby.i-did-not-set--mail-host-address--so-tickle-me> <87bmxitmdi.fsf@kirby.i-did-not-set--mail-host-address--so-tickle-me> <87y40m8ben.fsf@gnu.org> <8760nqtbg6.fsf@kirby.i-did-not-set--mail-host-address--so-tickle-me> <87lgwm6rwx.fsf@gnu.org> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:44174) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1c7A8l-00021c-4a for guix-devel@gnu.org; Wed, 16 Nov 2016 19:01:21 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1c7A8h-0006eR-NW for guix-devel@gnu.org; Wed, 16 Nov 2016 19:01:19 -0500 In-Reply-To: <87lgwm6rwx.fsf@gnu.org> List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: "Guix-devel" To: Ludovic =?utf-8?Q?Court=C3=A8s?= Cc: guix-devel@gnu.org --=-=-= Content-Type: multipart/signed; boundary="==-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" --==-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Ludovic Court=C3=A8s writes: > Marius Bakke skribis: > >> Some failures are indeed due to missing network or programs in the build >> environment. I tried patching a few just now, but unfortunately some >> files are in a format apparently not supported by Guile! >> >> 870: 5 [call-with-input-file "ext/mbstring/tests/bug26639.phpt" ...] >> In /gnu/store/ciqw5z470c8ihl1kfswj1j3ix6hs092d-module-import/guix/build/= utils.scm: >> 556: 4 [#> d/utils.scm:555:10 (in)> #] >> 592: 3 [#> d/utils.scm:578:6 (in out)> # ...] >> In ice-9/rdelim.scm: >> 188: 2 [read-line # concat] >> In unknown file: >> ?: 1 [%read-line #] >> In ice-9/boot-9.scm: >> 109: 0 [# decoding-error ...] >> >> ice-9/boot-9.scm:109:20: In procedure #> s)>: >> ice-9/boot-9.scm:109:20: Throw to key `decoding-error' with args `("scm_= getc" "input decoding error >> " 84 #)'. >> >> `file` reports: ext/mbstring/tests/bug26639.phpt: Non-ISO extended-ASCII= text > > Presumably this is =E2=80=98substitute*=E2=80=99 failing to read the file. > > =E2=80=98substitute*=E2=80=99 expects input files to be UTF-8-encoded; wh= en this is not > the case, you need to bind =E2=80=98%default-port-encoding=E2=80=99 to wh= atever is the > right encoding or #f for the catch-all ISO-8859-1. See > =E2=80=98gettext-minimal=E2=80=99 for an example. Thank you! That was exactly what I needed. Unfortunately that only fixed a handful of tests, the remaining 50-something had to be disabled for a variety of reasons. I've added a commentary to each disabled test. If you recognize any of these errors/think you know what's going on, please update the patch. It would be nice to know if the iconv and gd stuff is expected, and if the two sqlite tests can really be ignored. The curl one is strange too. If there are no further comments, I will push this in the next few days: --==-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEcBAEBCgAGBQJYLPNGAAoJEKKgbfKjOlT6anMIAIWIMUpIPVqsx912o0K5XMB3 ONDYwILgsJzKEWT4pgdjoKLU3yKBrOwt3LdsxrPI0NCu9h13hrM+zH1qIEA2dtYD nUAVGt2Y4MsCGlYjTsLMZamBr5RAOuK19/XSA4841VWw42mThVW94rOcdiLznSH3 OIQX/HZihRUBEVxJ/bGg355zy1/JeJNJKYE7+TA94FYtUybKQ5vhCyVYXhWjaH9o cjqq2Dndcx58f59veIkMeJSbnO0kvDdbc4UJ0tWUe2IaeQr7HbMMJOMwd7c6atMR m9iI6PyzGXROddwXp23z6MzMsj3tPX0jkTJg+b+zypnBkY9HJui23ZzC4oY52F8= =fizF -----END PGP SIGNATURE----- --==-=-=-- --=-=-= Content-Type: text/x-patch; charset=utf-8 Content-Disposition: inline; filename=0001-gnu-Add-php.patch Content-Transfer-Encoding: quoted-printable >From 692ef93d2e2df9b7d49977a2035fff1815ac34b0 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Fri, 11 Nov 2016 15:18:29 +0100 Subject: [PATCH] gnu: Add php. * gnu/packages/php.scm: New file. * gnu/local.mk (GNU_SYSTEM_MODULES): Add it. Co-authored-by: Marius Bakke --- gnu/local.mk | 1 + gnu/packages/php.scm | 329 +++++++++++++++++++++++++++++++++++++++++++++++= ++++ 2 files changed, 330 insertions(+) create mode 100644 gnu/packages/php.scm diff --git a/gnu/local.mk b/gnu/local.mk index 3989cb8..a857b46 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -295,6 +295,7 @@ GNU_SYSTEM_MODULES =3D \ %D%/packages/pem.scm \ %D%/packages/perl.scm \ %D%/packages/photo.scm \ + %D%/packages/php.scm \ %D%/packages/pkg-config.scm \ %D%/packages/plotutils.scm \ %D%/packages/polkit.scm \ diff --git a/gnu/packages/php.scm b/gnu/packages/php.scm new file mode 100644 index 0000000..83022ed --- /dev/null +++ b/gnu/packages/php.scm @@ -0,0 +1,329 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright =C2=A9 2016 Julien Lepiller +;;; Copyright =C2=A9 2016 Marius Bakke +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see . + +(define-module (gnu packages php) + #:use-module (gnu packages) + #:use-module (gnu packages algebra) + #:use-module (gnu packages aspell) + #:use-module (gnu packages base) + #:use-module (gnu packages bison) + #:use-module (gnu packages compression) + #:use-module (gnu packages curl) + #:use-module (gnu packages cyrus-sasl) + #:use-module (gnu packages databases) + #:use-module (gnu packages fontutils) + #:use-module (gnu packages gd) + #:use-module (gnu packages gettext) + #:use-module (gnu packages glib) + #:use-module (gnu packages gnupg) + #:use-module (gnu packages image) + #:use-module (gnu packages linux) + #:use-module (gnu packages multiprecision) + #:use-module (gnu packages openldap) + #:use-module (gnu packages pcre) + #:use-module (gnu packages pkg-config) + #:use-module (gnu packages readline) + #:use-module (gnu packages textutils) + #:use-module (gnu packages tls) + #:use-module (gnu packages web) + #:use-module (gnu packages xml) + #:use-module (gnu packages xorg) + #:use-module (gnu packages zip) + #:use-module (guix packages) + #:use-module (guix download) + #:use-module (guix build-system gnu) + #:use-module ((guix licenses) #:prefix license:)) + +(define-public php + (package + (name "php") + (version "7.0.13") + (home-page "https://secure.php.net/") + (source (origin + (method url-fetch) + (uri (string-append home-page "distributions/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "1gzihbpcp51jc587gs1ryn59hsnr7vf5427dmcvdimvm77wsfyrm")) + (modules '((guix build utils))) + (snippet + '(with-directory-excursion "ext" + (for-each delete-file-recursively + ;; Some of the bundled libraries have no prope= r upstream. + ;; Ideally we'd extract these out as separate = packages: + ;;"mbstring/libmbfl" + ;;"date/lib" + ;;"bcmath/libbcmath" + ;;"fileinfo/libmagic" ; This is a patched vers= ion of libmagic. + '("gd/libgd" + "mbstring/oniguruma" + "pcre/pcrelib" + "sqlite3/libsqlite" + "xmlrpc/libxmlrpc" + "zip/lib")))))) + (build-system gnu-build-system) + (arguments + '(#:configure-flags + (let-syntax ((with (syntax-rules () + ((_ option input) + (string-append option "=3D" + (assoc-ref %build-inputs input= )))))) + (list (with "--with-bz2" "bzip2") + (with "--with-curl" "curl") + (with "--with-freetype-dir" "freetype") + (with "--with-gd" "gd") + (with "--with-gdbm" "gdbm") + (with "--with-gettext" "glibc") ; libintl.h + (with "--with-gmp" "gmp") + (with "--with-jpeg-dir" "libjpeg") + (with "--with-ldap" "openldap") + (with "--with-ldap-sasl" "cyrus-sasl") + (with "--with-libzip" "zip") + (with "--with-libxml-dir" "libxml2") + (with "--with-onig" "oniguruma") + (with "--with-pcre-dir" "pcre") + (with "--with-pcre-regex" "pcre") + (with "--with-pdo-pgsql" "postgresql") + (with "--with-pdo-sqlite" "sqlite") + (with "--with-pgsql" "postgresql") + (with "--with-png-dir" "libpng") + ;; PHP=E2=80=99s Pspell extension, while retaining its curr= ent name, + ;; now uses the Aspell library. + (with "--with-pspell" "aspell") + (with "--with-readline" "readline") + (with "--with-sqlite3" "sqlite") + (with "--with-tidy" "tidy") + (with "--with-webp-dir" "libwebp") + (with "--with-xpm-dir" "libxpm") + (with "--with-xsl" "libxslt") + (with "--with-zlib-dir" "zlib") + ;; We could add "--with-snmp", but it requires netsnmp that + ;; we don't have a package for. It is used to build the snmp + ;; extension of php. + "--with-iconv" + "--with-openssl" + "--with-pdo-mysql" + "--with-zlib" + "--enable-calendar" + "--enable-dba=3Dshared" + "--enable-exif" + "--enable-flatfile" + "--enable-fpm" + "--enable-ftp" + "--enable-inifile" + "--enable-mbstring" + "--enable-pcntl" + "--enable-sockets" + "--enable-threads")) + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'do-not-record-build-flags + (lambda _ + ;; Prevent configure flags from being stored and causing + ;; unnecessary runtime dependencies. + (substitute* "scripts/php-config.in" + (("@CONFIGURE_OPTIONS@") "") + (("@PHP_LDFLAGS@") "")) + ;; This file has ISO-8859-1 encoding. + (with-fluids ((%default-port-encoding "ISO-8859-1")) + (substitute* "main/build-defs.h.in" + (("@CONFIGURE_COMMAND@") "(omitted)"))) + #t)) + (add-before 'build 'patch-/bin/sh + (lambda _ + (substitute* '("run-tests.php" "ext/standard/proc_open.c") + (("/bin/sh") (which "sh"))) + #t)) + (add-before 'check 'prepare-tests + (lambda _ + ;; Some of these files have ISO-8859-1 encoding, whereas othe= rs + ;; use ASCII, so we can't use a "catch-all" find-files here. + (with-fluids ((%default-port-encoding "ISO-8859-1")) + (substitute* '("ext/mbstring/tests/mb_send_mail02.phpt" + "ext/mbstring/tests/mb_send_mail04.phpt" + "ext/mbstring/tests/mb_send_mail05.phpt" + "ext/mbstring/tests/mb_send_mail06.phpt") + (("/bin/cat") (which "cat")))) + (substitute* '("ext/mbstring/tests/mb_send_mail01.phpt" + "ext/mbstring/tests/mb_send_mail03.phpt" + "ext/mbstring/tests/bug52861.phpt" + "ext/standard/tests/general_functions/bug34794= .phpt" + "ext/standard/tests/general_functions/bug44667= .phpt" + "ext/standard/tests/general_functions/proc_ope= n.phpt") + (("/bin/cat") (which "cat"))) + ;; The encoding of this file is not recognized, so we simply = drop it. + (delete-file "ext/mbstring/tests/mb_send_mail07.phpt") + + (substitute* "ext/standard/tests/streams/bug60602.phpt" + (("'ls'") (string-append "'" (which "ls") "'"))) + + ;; Drop tests that are known to fail. + (for-each delete-file + '("ext/posix/tests/posix_getgrgid.phpt" ; Requir= es /etc/group. + "ext/sockets/tests/bug63000.phpt" ; Fails = to detect OS. + "ext/sockets/tests/socket_shutdown.phpt" ; Requir= es DNS. + "ext/sockets/tests/socket_send.phpt" ; Likewi= se. + "ext/sockets/tests/mcast_ipv4_recv.phpt" ; Requir= es multicast. + ;; These needs /etc/services. + "ext/standard/tests/general_functions/getservbyna= me_basic.phpt" + "ext/standard/tests/general_functions/getservbypo= rt_basic.phpt" + "ext/standard/tests/general_functions/getservbypo= rt_variation1.phpt" + ;; And /etc/protocols. + "ext/standard/tests/network/getprotobyname_basic.= phpt" + "ext/standard/tests/network/getprotobynumber_basi= c.phpt" + ;; And exotic locales. + "ext/standard/tests/strings/setlocale_basic1.phpt" + "ext/standard/tests/strings/setlocale_basic2.phpt" + "ext/standard/tests/strings/setlocale_basic3.phpt" + "ext/standard/tests/strings/setlocale_variation1.= phpt" + + ;; XXX: These gd tests fails. Likely because our= version + ;; is newer than the bundled one. + ;; Here, gd quits immediately after "fatal libpng= error"; while the + ;; test expects it to additionally return a "setj= mp" error and warning. + "ext/gd/tests/bug39780_extern.phpt" + "ext/gd/tests/libgd00086_extern.phpt" + ;; Extra newline in gd-png output. + "ext/gd/tests/bug45799.phpt" + ;; Different error message than expected from ima= gecrop(). + "ext/gd/tests/bug66356.phpt" + ;; Similarly for imagecreatefromgd2(). + "ext/gd/tests/bug72339.phpt" + ;; Call to undefined function imageantialias(). = They are + ;; supposed to fail anyway. + "ext/gd/tests/bug72482.phpt" + "ext/gd/tests/bug72482_2.phpt" + "ext/gd/tests/bug73213.phpt" + ;; Test expects generic "gd warning" but gets the= actual function name. + "ext/gd/tests/createfromwbmp2_extern.phpt" + ;; TODO: Enable these when libgd is built with xp= m support. + "ext/gd/tests/xpm2gd.phpt" + "ext/gd/tests/xpm2jpg.phpt" + "ext/gd/tests/xpm2png.phpt" + + ;; XXX: These iconv tests have the expected outco= me, + ;; but with different error messages. + ;; Expects "illegal character", instead gets "unk= nown error (84)". + "ext/iconv/tests/bug52211.phpt" + ;; Expects "wrong charset", gets unknown error (2= 2). + "ext/iconv/tests/iconv_mime_decode_variation3.php= t" + "ext/iconv/tests/iconv_strlen_error2.phpt" + "ext/iconv/tests/iconv_strlen_variation2.phpt" + "ext/iconv/tests/iconv_substr_error2.phpt" + ;; Expects conversion error, gets "error conditio= n Termsig=3D11". + "ext/iconv/tests/iconv_strpos_error2.phpt" + "ext/iconv/tests/iconv_strrpos_error2.phpt" + ;; Similar, but iterating over multiple values. + ;; iconv breaks the loop after the first error wi= th Termsig=3D11. + "ext/iconv/tests/iconv_strpos_variation4.phpt" + "ext/iconv/tests/iconv_strrpos_variation3.phpt" + + ;; XXX: These test failures appear legitimate, ne= eds investigation. + ;; open_basedir() restriction failure. + "ext/curl/tests/bug61948.phpt" + ;; Expects a false boolean, gets empty array from= glob(). + "ext/standard/tests/file/bug41655_1.phpt" + "ext/standard/tests/file/glob_variation5.phpt" + ;; Test output is correct, but in wrong order. + "ext/standard/tests/streams/proc_open_bug64438.ph= pt" + ;; The test expects an Array, but instead get the= contents(?). + "ext/gd/tests/bug43073.phpt" + ;; imagettftext() returns wrong coordinates. + "ext/gd/tests/bug48732.phpt" + ;; Similarly for imageftbbox(). + "ext/gd/tests/bug48801.phpt" + ;; Different expected output from imagecoloralloc= ate(). + "ext/gd/tests/bug53504.phpt" + ;; Wrong chunk count after unpacking a value from= imagegd2(). + "ext/gd/tests/bug73155.phpt" + ;; Wrong format after unpacking a value from imag= egd2(). + "ext/gd/tests/bug73159.phpt" + ;; Wrong image size after scaling an image. + "ext/gd/tests/bug73272.phpt" + ;; Expects iconv to detect illegal characters, in= stead gets + ;; "unknown error (84)" and heap corruption(!). + "ext/iconv/tests/bug48147.phpt" + ;; Expects illegal character ".", gets "=3D?utf-8= ?Q?." + "ext/iconv/tests/bug51250.phpt" + ;; @iconv() does not return expected output. + "ext/iconv/tests/iconv003.phpt" + ;; iconv throws "buffer length exceeded" on some = string checks. + "ext/iconv/tests/iconv_mime_encode.phpt" + ;; file_get_contents(): iconv stream filter + ;; ("ISO-8859-1"=3D>"UTF-8") unknown error. + "ext/standard/tests/file/bug43008.phpt" + ;; Table data not created in sqlite? + "ext/pdo_sqlite/tests/bug_42589.phpt" + ;; Seems unable to delete from a table here. + "ext/sqlite3/tests/bug73068.phpt")) + + ;; Skip tests requiring network access. + (setenv "SKIP_ONLINE_TESTS" "1") + ;; Without this variable, `make test' passes regardless of fa= ilures. + (setenv "REPORT_EXIT_STATUS" "1") + #t))) + #:test-target "test")) + (inputs + `(("aspell" ,aspell) + ("bzip2" ,bzip2) + ("curl" ,curl) + ("cyrus-sasl" ,cyrus-sasl) + ("freetype" ,freetype) + ("gd" ,gd) + ("gdbm" ,gdbm) + ("glibc" ,glibc) + ("gmp" ,gmp) + ("libgcrypt" ,libgcrypt) + ("libjpeg" ,libjpeg) + ("libpng" ,libpng) + ("libwebp" ,libwebp) + ("libxml2" ,libxml2) + ("libxpm" ,libxpm) + ("libxslt" ,libxslt) + ("libx11" ,libx11) + ("oniguruma" ,oniguruma) + ("openldap" ,openldap) + ("openssl" ,openssl) + ("pcre" ,pcre) + ("postgresql" ,postgresql) + ("readline" ,readline) + ("sqlite" ,sqlite) + ("tidy" ,tidy) + ("zip" ,zip) + ("zlib" ,zlib))) + (native-inputs + `(("pkg-config" ,pkg-config) + ("bison" ,bison) + ("intltool" ,intltool) + ("procps" ,procps))) ; For tests. + (synopsis "PHP programming language") + (description + "PHP (PHP Hypertext Processor) is a server-side (CGI) scripting +language designed primarily for web development but is also used as +a general-purpose programming language. PHP code may be embedded into +HTML code, or it can be used in combination with various web template +systems, web content management systems and web frameworks." ) + (license (list + (license:non-copyleft "file://LICENSE") ; The PHP lice= nse. + (license:non-copyleft "file://Zend/LICENSE") ; The Zend lic= ense. + license:lgpl2.1 ; ext/mbstring= /libmbfl + license:lgpl2.1+ ; ext/bcmath/l= ibbcmath + license:bsd-2 ; ext/fileinfo= /libmagic + license:expat)))) ; ext/date/lib --=20 2.10.2 --=-=-=--