From mboxrd@z Thu Jan 1 00:00:00 1970 From: Marius Bakke Subject: Re: [PATCH] Add php Date: Mon, 14 Nov 2016 13:53:13 +0000 Message-ID: <8760nqtbg6.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> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:33958) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1c6HhI-0001cm-70 for guix-devel@gnu.org; Mon, 14 Nov 2016 08:53:22 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1c6HhE-0002tx-Jw for guix-devel@gnu.org; Mon, 14 Nov 2016 08:53:20 -0500 In-Reply-To: <87y40m8ben.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: > Hi Marius, > > Marius Bakke skribis: > >> Marius Bakke writes: >> >>> Julien Lepiller writes: >>> >>>>> Could you send an updated patch to address those issues? Then we can >>>>> happily apply it. >>>> here is the updated patch. I let the tests be done because it doesn't >>>> harm, but it does no good either, so feel free to disable them if you >>>> prefer. >>> >>> Hello! I've gone through this package and made some improvements. I also >>> managed to enable the test suite, but had to resort to strace to figure >>> out what was going on (/bin/sh calls..). >> >> Oops, here is a version that actually passes `guix lint`. >> >> From 83b2913549784e5d3bafd29641e314b308f7df11 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. > > Thanks for the update! > >> + ;;"bcmath/libbcmath" > > So this one is very different from =E2=80=98bc=E2=80=99? Yes, it's a completely different project and apparently more akin to 'gmp'. It's maintained within the PHP repository. >> + ;;"fileinfo/libmagic" ; This is a patched v= ersion of libmagic. > > Here adding a dependency on =E2=80=98file=E2=80=99 instead (the package t= hat provides > libmagic) didn=E2=80=99t cut it, right? Correct. The build system expects to build this, and it appears to be heavily patched, so I did not try very hard. >> + (add-before 'check 'set-test-environment >> + (lambda _ >> + ;; Without this variable, `make test' passes regardless of= failures. >> + (setenv "REPORT_EXIT_STATUS" "1") >> + #t))) >> + #:test-target "test" >> + #:tests? #t)) > > Do you have more info as to what fails? I wouldn=E2=80=99t be surprised = if > there were lots of issues having to do with the use of /bin/sh, host > name lookups, and other things not available in the build environment. > > Could you gather more info as to what fails so that we can either fix > it, or at least convince ourselves that these are not serious issues and > document them in a comment? 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/uti= ls.scm: 556: 4 [# #] 592: 3 [# # .= ..] In ice-9/rdelim.scm: 188: 2 [read-line # concat] In unknown file: ?: 1 [%read-line #] In ice-9/boot-9.scm: 109: 0 [# d= ecoding-error ...] ice-9/boot-9.scm:109:20: In procedure #: ice-9/boot-9.scm:109:20: Throw to key `decoding-error' with args `("scm_get= c" "input decoding error " 84 #)'. `file` reports: ext/mbstring/tests/bug26639.phpt: Non-ISO extended-ASCII te= xt Can we work around this somehow? There are more files with non-standard file types that can't be substituted. I also found a flag "SKIP_ONLINE_TESTS" which should rule out some more failures. Attached is an updated patch, but there is still a long way to go. I will continue this journey tomorrow: --==-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEcBAEBCgAGBQJYKcHJAAoJEKKgbfKjOlT66i8H/ipOMVz7F5u1116xEHIfSx3M VP/J1PAm31+zawYTgF4OpLb5Nk2KQbBVPtAGlHh9N0j2vpOOITf/G5CT4MK4+aIw K3dOIPD2orUb8q7X7sQt8cx+PefquVlyXlpZEu5sQvGAhc5EGG1MxKq2BSUGA4LO 50pYS3NCO2Bl8GwfuLkdWpYYATHTtZADbGWUo/464FkqrmHsXv/4NcYe24lKD5yP P3rGWDgPIhICRBLJVGNFQMMmbiF/4fQ9rHDyQuMDz2JxWrEMP0iOJ0PktLuATBSz Z9zawwBB0bMCjZu+5BIkW/sgsMX1LLP0mu850O4iiLmRHz9HxKIHTXcqX89IcFY= =Jq1c -----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 abedcccd5a184cc600f122fe01149884ba30c318 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. --- gnu/local.mk | 1 + gnu/packages/php.scm | 208 +++++++++++++++++++++++++++++++++++++++++++++++= ++++ 2 files changed, 209 insertions(+) create mode 100644 gnu/packages/php.scm diff --git a/gnu/local.mk b/gnu/local.mk index ce0fdeb..7d10aa6 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..96e3d07 --- /dev/null +++ b/gnu/packages/php.scm @@ -0,0 +1,208 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright =C2=A9 2016 Julien Lepiller +;;; +;;; 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 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. + ;; FIXME: Guile throws decoding error on this ISO-8859 file. + ;(substitute* "main/build-defs.h.in" + ; (("@CONFIGURE_COMMAND@") "(omitted)")) + (substitute* "scripts/php-config.in" + (("@CONFIGURE_OPTIONS@") "") + (("@PHP_LDFLAGS@") "")) + #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 _ + ;; FIXME: Some of these files are non-ASCII and can't be subs= tituted. + ;(substitute* (append (find-files "ext/mbstring/tests") + ; (find-files "ext/standard/tests")) + ; (("/bin/cat") (which "cat"))) + (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) + ("libxml2" ,libxml2))) ; for xml2-config + (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 --=-=-=--