From mboxrd@z Thu Jan 1 00:00:00 1970 From: =?utf-8?B?5a6L5paH5q2m?= Subject: Re: [PATCH 2/2] gnu: python-pycairo: Fix build with with python-3.4.3. Date: Mon, 20 Apr 2015 14:51:45 +0800 Message-ID: <87r3rf70n2.fsf@gmail.com> References: <1429509136-11290-1-git-send-email-iyzsong@gmail.com> <1429509136-11290-2-git-send-email-iyzsong@gmail.com> <871tjf2u1p.fsf@mango.localdomain> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:43487) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yk5Y0-0004jo-H5 for guix-devel@gnu.org; Mon, 20 Apr 2015 02:51:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Yk5Xx-0005VD-7u for guix-devel@gnu.org; Mon, 20 Apr 2015 02:51:12 -0400 Received: from mail-pa0-x22d.google.com ([2607:f8b0:400e:c03::22d]:34133) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yk5Xw-0005V7-R9 for guix-devel@gnu.org; Mon, 20 Apr 2015 02:51:09 -0400 Received: by pacyx8 with SMTP id yx8so197579208pac.1 for ; Sun, 19 Apr 2015 23:51:08 -0700 (PDT) In-Reply-To: <871tjf2u1p.fsf@mango.localdomain> 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: Ricardo Wurmus Cc: guix-devel@gnu.org --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Ricardo Wurmus writes: > =E5=AE=8B=E6=96=87=E6=AD=A6 writes: >> + (alist-cons-before >> + 'build 'configure >> + (lambda* (#:key outputs #:allow-other-keys) >> + (zero? (system* "./waf" "configure" >> + (string-append "--prefix=3D" >> + (assoc-ref outputs "= out"))))) >> (alist-replace >> - 'install >> + 'build >> (lambda _ >> - (zero? (system* "./waf" "install"))) >> - %standard-phases))))) >> + (zero? (system* "./waf" "build"))) >> + (alist-replace >> + 'install >> + (lambda _ >> + (zero? (system* "./waf" "install"))) >> + %standard-phases)))))) > > I wonder if it would make sense to just use the waf-build-system in this > case instead of the python-build-system. Is this feasible? Yes! Thanks for the tip. Here are the new patch using waf-build-system: --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0001-gnu-python-pycairo-Fix-build-with-with-python-3.4.3.patch >From 9a83f762e5f5479a9efedefc6fea9c37a49bb87e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E6=96=87=E6=AD=A6?= Date: Mon, 20 Apr 2015 13:45:43 +0800 Subject: [PATCH] gnu: python-pycairo: Fix build with with python-3.4.3. * gnu/packages/patches/pycairo-wscript.patch: New file. * gnu-system.am (dist_patch_DATA): Add it. * gnu/packages/gtk.scm (python-pycairo)[source]: Use it. [build-system]: Use waf-build-system. [native-inputs]: Add python-waf. [arguments]<#:phases>: Use 'modify-phases'. Add 'patch-waf phase. * gnu/packages/gtk.scm (python2-pycairo): Adjust accordingly. --- gnu-system.am | 1 + gnu/packages/gtk.scm | 37 +++++++++++++++--------------- gnu/packages/patches/pycairo-wscript.patch | 31 +++++++++++++++++++++++++ 3 files changed, 50 insertions(+), 19 deletions(-) create mode 100644 gnu/packages/patches/pycairo-wscript.patch diff --git a/gnu-system.am b/gnu-system.am index b11706c..723d251 100644 --- a/gnu-system.am +++ b/gnu-system.am @@ -514,6 +514,7 @@ dist_patch_DATA = \ gnu/packages/patches/procps-make-3.82.patch \ gnu/packages/patches/pulseaudio-fix-mult-test.patch \ gnu/packages/patches/pulseaudio-longer-test-timeout.patch \ + gnu/packages/patches/pycairo-wscript.patch \ gnu/packages/patches/pybugz-encode-error.patch \ gnu/packages/patches/pybugz-stty.patch \ gnu/packages/patches/pyqt-configure.patch \ diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index cd54cfc..67838a3 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -30,6 +30,7 @@ #:use-module (guix build-system gnu) #:use-module (guix build-system python) #:use-module (guix build-system waf) + #:use-module (gnu packages) #:use-module (gnu packages check) #:use-module (gnu packages gettext) #:use-module (gnu packages compression) @@ -733,29 +734,23 @@ extensive documentation, including API reference and a tutorial.") version ".tar.bz2")) (sha256 (base32 - "1gjkf8x6hyx1skq3hhwcbvwifxvrf9qxis5vx8x5igmmgs70g94s")))) - (build-system python-build-system) + "1gjkf8x6hyx1skq3hhwcbvwifxvrf9qxis5vx8x5igmmgs70g94s")) + (patches (list (search-patch "pycairo-wscript.patch"))))) + (build-system waf-build-system) (native-inputs - `(("pkg-config" ,pkg-config))) + `(("pkg-config" ,pkg-config) + ("python-waf" ,python-waf))) (propagated-inputs ;pycairo.pc references cairo `(("cairo" ,cairo))) (arguments `(#:tests? #f - #:phases (alist-cons-before - 'build 'configure - (lambda* (#:key outputs #:allow-other-keys) - (zero? (system* "./waf" "configure" - (string-append "--prefix=" - (assoc-ref outputs "out"))))) - (alist-replace - 'build - (lambda _ - (zero? (system* "./waf" "build"))) - (alist-replace - 'install - (lambda _ - (zero? (system* "./waf" "install"))) - %standard-phases))))) + #:phases + (modify-phases %standard-phases + (add-before + 'configure 'patch-waf + (lambda* (#:key inputs #:allow-other-keys) + ;; The bundled `waf' doesn't work with python-3.4.x. + (copy-file (assoc-ref %build-inputs "python-waf") "./waf")))))) (home-page "http://cairographics.org/pycairo/") (synopsis "Python bindings for cairo") (description @@ -776,7 +771,11 @@ extensive documentation, including API reference and a tutorial.") "0cblk919wh6w0pgb45zf48xwxykfif16qk264yga7h9fdkq3j16k")))) (arguments `(#:python ,python-2 - ,@(package-arguments python-pycairo))) + ,@(substitute-keyword-arguments (package-arguments python-pycairo) + ((#:phases phases) + `(alist-delete 'patch-waf ,phases)) + ((#:native-inputs native-inputs) + `(alist-delete "python-waf" ,native-inputs))))) ;; Dual-licensed under LGPL 2.1 or Mozilla Public License 1.1 (license (list license:lgpl2.1 license:mpl1.1)))) diff --git a/gnu/packages/patches/pycairo-wscript.patch b/gnu/packages/patches/pycairo-wscript.patch new file mode 100644 index 0000000..c49f0af --- /dev/null +++ b/gnu/packages/patches/pycairo-wscript.patch @@ -0,0 +1,31 @@ +Update the wscript to work with waf-1.8.8. Based on: +http://cgit.freedesktop.org/pycairo/commit/?id=c57cd129407c904f8c2f752a59d0183df7b01a5e + + +--- pycairo-1.10.0.orig/wscript 2011-04-18 15:42:29.000000000 +0800 ++++ pycairo-1.10.0/wscript 2015-04-20 13:01:45.383756898 +0800 +@@ -13,18 +13,18 @@ + + def options(ctx): + print(' %s/options()' %d) +- ctx.tool_options('gnu_dirs') +- ctx.tool_options('compiler_cc') +- ctx.tool_options('python') # options for disabling pyc or pyo compilation ++ ctx.load('gnu_dirs') ++ ctx.load('compiler_c') ++ ctx.load('python') # options for disabling pyc or pyo compilation + + + def configure(ctx): + print(' %s/configure()' %d) + + env = ctx.env +- ctx.check_tool('gnu_dirs') +- ctx.check_tool('compiler_cc') +- ctx.check_tool('python') ++ ctx.load('gnu_dirs') ++ ctx.load('compiler_c') ++ ctx.load('python') + ctx.check_python_version((3,1,0)) + ctx.check_python_headers() + ctx.check_cfg(package='cairo', atleast_version=cairo_version_required, -- 2.2.1 --=-=-= Content-Type: text/plain > > ~~ Ricardo --=-=-=--