From mboxrd@z Thu Jan 1 00:00:00 1970 From: Efraim Flashner Subject: Re: [PATCH 1/4] gnu: glib: Use modify-phases syntax. Date: Sun, 3 Apr 2016 19:56:21 +0300 Message-ID: <20160403165621.GC3620@debian-netbook> References: <1459650631-13117-1-git-send-email-iyzsong@gmail.com> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="oTHb8nViIGeoXxdp" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:56180) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1amlK7-0002Fe-LR for guix-devel@gnu.org; Sun, 03 Apr 2016 12:56:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1amlK4-0000Db-Fl for guix-devel@gnu.org; Sun, 03 Apr 2016 12:56:27 -0400 Received: from flashner.co.il ([178.62.234.194]:42531) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1amlK4-0000DW-4P for guix-devel@gnu.org; Sun, 03 Apr 2016 12:56:24 -0400 Content-Disposition: inline In-Reply-To: <1459650631-13117-1-git-send-email-iyzsong@gmail.com> 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-bounces+gcggd-guix-devel=m.gmane.org@gnu.org To: =?utf-8?B?5a6L5paH5q2m?= Cc: guix-devel@gnu.org --oTHb8nViIGeoXxdp Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Sun, Apr 03, 2016 at 10:30:28AM +0800, =E5=AE=8B=E6=96=87=E6=AD=A6 wrote: > * gnu/packages/glib.scm (glib)[arguments]: Use 'modify-phases'. > --- > gnu/packages/glib.scm | 44 ++++++++++++++++++++++---------------------- > 1 file changed, 22 insertions(+), 22 deletions(-) >=20 > diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm > index 854a1f2..2fb601c 100644 > --- a/gnu/packages/glib.scm > +++ b/gnu/packages/glib.scm > @@ -161,29 +161,29 @@ shared NFS home directories.") > ("perl" ,perl) ; needed by GIO tests > ("bash" ,bash))) > (arguments > - '(#:phases (alist-cons-before > - 'build 'pre-build > - (lambda* (#:key inputs outputs #:allow-other-keys) > - ;; For tests/gdatetime.c. > - (setenv "TZDIR" > - (string-append (assoc-ref inputs "tzdata") > - "/share/zoneinfo")) > - > - ;; Some tests want write access there. > - (setenv "XDG_CACHE_HOME" (getcwd)) > - > - (substitute* '("glib/gspawn.c" > - "glib/tests/utils.c" > - "tests/spawn-test.c") > - (("/bin/sh") > - (string-append (assoc-ref inputs "bash") "/bin/sh")= )) > - > - ;; Disable a test that requires dbus. > - (substitute* "gio/tests/gdbus-serialization.c" > - (("g_test_add_func \ > + '(#:phases > + (modify-phases %standard-phases > + (add-before 'build 'pre-build > + (lambda* (#:key inputs outputs #:allow-other-keys) > + ;; For tests/gdatetime.c. > + (setenv "TZDIR" > + (string-append (assoc-ref inputs "tzdata") > + "/share/zoneinfo")) > + > + ;; Some tests want write access there. > + (setenv "XDG_CACHE_HOME" (getcwd)) > + > + (substitute* '("glib/gspawn.c" > + "glib/tests/utils.c" > + "tests/spawn-test.c") > + (("/bin/sh") > + (string-append (assoc-ref inputs "bash") "/bin/sh"))) > + > + ;; Disable a test that requires dbus. > + (substitute* "gio/tests/gdbus-serialization.c" > + (("g_test_add_func \ > \\(\"/gdbus/message-serialize/double-array\", test_double_array\\);" all) > - (string-append "/* " all " */")))) > - %standard-phases) > + (string-append "/* " all " */")))))) > =20 > ;; Note: `--docdir' and `--htmldir' are not honored, so work aroun= d it. > #:configure-flags (list (string-append "--with-html-dir=3D" > --=20 > 2.6.3 >=20 This looks good to me --=20 Efraim Flashner =D7=90=D7=A4=D7=A8=D7=99=D7=9D = =D7=A4=D7=9C=D7=A9=D7=A0=D7=A8 GPG key =3D A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 Confidentiality cannot be guaranteed on emails sent or received unencrypted --oTHb8nViIGeoXxdp Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCgAGBQJXAUs1AAoJEPTB05F+rO6TyXkQAJQmn9uMYAaD2u0UFSTg/2Cg EwpBRnEUgLNayJd5qKYd3SRRRsd+X4G9E3syGROV6oMApIgmQ4FhJXvNrZurx3l+ RKqqdDwelFDS+r38msDOZ41rJYH+FHWFxfC+XvvI6r2PVmp9XbYmjGjBjqH1Goyd gnaoMhCSIIU5lJAGILqFN8VQRSSbj9UnRc0zWgWMTfavq3cDDvJsad+kde1f0llX 95MZUgvdVHL3gt/IW3iiChHUfJJ5OuByhjVWk22HhSWDZls22fwULBoAIqPSPxPN gtBFDASUZLcTrcDpgYJv+vX7xWQTVIZgJhR703lLOqKkG27VjwCk75RTDSv3lWrz +cPE1deUxQJGbBcr6DYSlD2WLfnk965F9h53NzGaP9uOJ8JcWkH9iLGjWFC06oJH uOyrhrTzz/z6Q9iiZCixnCt+WvclXT7RRsa/2aOgoUMBKWWzNpI+LA+IU5yXMRyk j0vEtNaiazAnDGQU6DxXA/jfpUXx+vnZaXyBS4LrZ0G86l3LsHDy6SCu1dgJ0QlE VURibpQZpCOuYS25U6PfUZg61pnfD7IT2+u1Bnnug7bPTQz/JoujvwcefdVUYc8P jXqaUsyI66R5uzWklUKG58McfKPljzmoTQsirf3ZBMG1BU4m1WraWWqmyu0Fg2eF 5QvSbycHO4MC2SR5y8qv =FC8w -----END PGP SIGNATURE----- --oTHb8nViIGeoXxdp--