[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
33/51: gnu: libimobiledevice: Fix build with Python 3.8.
From: |
guix-commits |
Subject: |
33/51: gnu: libimobiledevice: Fix build with Python 3.8. |
Date: |
Fri, 24 Jan 2020 14:48:20 -0500 (EST) |
mbakke pushed a commit to branch core-updates
in repository guix.
commit 403b533fde0d34bd2cb961abe1abbcb17ddf6045
Author: Marius Bakke <address@hidden>
AuthorDate: Thu Jan 16 18:00:25 2020 +0100
gnu: libimobiledevice: Fix build with Python 3.8.
* gnu/packages/libusb.scm (%libimobiledevice-patches): New variable.
(libimobiledevice)[source](patches): New field.
[arguments]: Remove #:configure-flags. Add #:phases.
[native-inputs]: Add AUTOCONF and AUTOMAKE.
---
gnu/packages/libusb.scm | 38 ++++++++++++++++++++++++++++++++------
1 file changed, 32 insertions(+), 6 deletions(-)
diff --git a/gnu/packages/libusb.scm b/gnu/packages/libusb.scm
index abf1140..1a677a0 100644
--- a/gnu/packages/libusb.scm
+++ b/gnu/packages/libusb.scm
@@ -8,6 +8,7 @@
;;; Copyright © 2017 Jonathan Brielmaier <address@hidden>
;;; Copyright © 2018 Tobias Geerinckx-Rice <address@hidden>
;;; Copyright © 2018 Vagrant Cascadian <address@hidden>
+;;; Copyright © 2020 Marius Bakke <address@hidden>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -364,6 +365,25 @@ connections from and to iOS devices by connecting to a
socket provided by a
@code{usbmuxd} daemon.")
(license license:lgpl2.1+)))
+;; These patches are needed to build with Python 3.8.
+(define %libimobiledevice-patches
+ (list (origin
+ (method url-fetch)
+ (uri (string-append
"https://github.com/libimobiledevice/libimobiledevice"
+
"/commit/1ff3448d2e27f1bac8d2f0af8b8e952854860278.patch"))
+ (file-name "libimobiledevice-python-config.patch")
+ (sha256
+ (base32
+ "1mkwhp8vvhajij29jk3w4rkgcfh8d8waf908drh3076k70hb6i8y")))
+ (origin
+ (method url-fetch)
+ (uri (string-append
"https://github.com/libimobiledevice/libimobiledevice"
+
"/commit/eea4f1be9107c8ab621fd71460e47d0d38e55d71.patch"))
+ (file-name "libimobiledevice-python-3.8-compat.patch")
+ (sha256
+ (base32
+ "1zz8v7kgwyq5ck1qp03l29pcmljygnjwls9d6q28nv5pkwa6848w")))))
+
(define-public libimobiledevice
(package
(name "libimobiledevice")
@@ -372,17 +392,19 @@ connections from and to iOS devices by connecting to a
socket provided by a
(method url-fetch)
(uri (string-append "https://www.libimobiledevice.org/downloads/"
"libimobiledevice-" version ".tar.bz2"))
+ ;; Note: Remove the 'force-bootstrap' phase and the autoconf
+ ;; inputs below when removing these patches.
+ (patches %libimobiledevice-patches)
(sha256
(base32
"0dqhy4qwj30mw8pwckvjmgnj1qqrh6p8c6jknmhvylshhzh0ssvq"))))
(build-system gnu-build-system)
(arguments
- `(#:configure-flags
- (list (string-append "PYTHON_LDFLAGS=-L"
- (assoc-ref %build-inputs "python")
- "/lib -lpython"
- ,(version-major+minor (package-version python))
- "m"))))
+ `(#:phases (modify-phases %standard-phases
+ (add-before 'bootstrap 'force-bootstrap
+ (lambda _
+ (delete-file "configure")
+ #t)))))
(propagated-inputs
`(("openssl" ,openssl-1.0)
("libplist" ,libplist)
@@ -392,6 +414,10 @@ connections from and to iOS devices by connecting to a
socket provided by a
(native-inputs
`(("pkg-config" ,pkg-config)
("python-cython" ,python-cython)
+
+ ;; These are required because we patch and bootstrap the build system.
+ ("autoconf" ,autoconf)
+ ("automake" ,automake)
("libtool" ,libtool)))
(home-page "https://www.libimobiledevice.org/")
(synopsis "Protocol library and tools to communicate with Apple devices")
- 37/51: gnu: python-six: Update to 1.14.0., (continued)
- 37/51: gnu: python-six: Update to 1.14.0., guix-commits, 2020/01/24
- 38/51: gnu: python-hypothesis: Update to 5.3.0., guix-commits, 2020/01/24
- 36/51: gnu: python-cffi: Update to 1.13.2., guix-commits, 2020/01/24
- 40/51: gnu: python-pycairo: Update to 1.19.0., guix-commits, 2020/01/24
- 27/51: gnu: python-mako: Do not use pytest nose compatibility layer., guix-commits, 2020/01/24
- 30/51: gnu: python-pygobject: Update to 3.34.0., guix-commits, 2020/01/24
- 42/51: gnu: python-pytest-runner: Update to 5.2., guix-commits, 2020/01/24
- 48/51: gnu: meson: Update to 0.53.1., guix-commits, 2020/01/24
- 08/51: gnu: python-py: Update to 1.8.1., guix-commits, 2020/01/24
- 26/51: gnu: python2-pytest: Update to 4.6.9., guix-commits, 2020/01/24
- 33/51: gnu: libimobiledevice: Fix build with Python 3.8.,
guix-commits <=
- 45/51: gnu: util-linux: Update to 2.35., guix-commits, 2020/01/24
- 23/51: gnu: python2-flake8: Add missing input., guix-commits, 2020/01/24
- 25/51: gnu: python2-pluggy: Update to 0.13.1., guix-commits, 2020/01/24
- 24/51: gnu: python2-importlib-resources: Drop 'wheel' dependency., guix-commits, 2020/01/24
- 29/51: gnu: python-pycairo: Update to 1.18.2., guix-commits, 2020/01/24
- 31/51: gnu: python-dateutil: Add missing input., guix-commits, 2020/01/24
- 15/51: gnu: python-mock: Update to 3.0.5., guix-commits, 2020/01/24
- 39/51: gnu: python-setuptools-scm: Update to 3.4.3., guix-commits, 2020/01/24
- 43/51: gnu: python-fonttools: Update to 4.2.4., guix-commits, 2020/01/24
- 44/51: gnu: libuv: Update to 1.34.2., guix-commits, 2020/01/24