ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-25 22:08:16 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: sqlite: Move Hurd-specific patch into source.

Browse source 
* gnu/packages/sqlite.scm (sqlite)[native-inputs]: Move conditional
"sqlite-hurd.patch" to...
[source]: ...here.
[arguments]: Remove "patch-sqlite/hurd" stage.
This commit is contained in:
Jan (janneke) Nieuwenhuizen 2020-10-26 13:53:51 +01:00
parent 061ffcf2ad
commit b2dc7cb8f9
No known key found for this signature in database
GPG key ID: F3C1A0D9C1D65273
1 changed files with 1 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
gnu/packages/sqlite.scm
View file

@ -62,16 +62,12 @@ (define-public sqlite
6 #\0))))))
(string-append "https://sqlite.org/2020/sqlite-autoconf-"
numeric-version ".tar.gz")))
(patches (search-patches "sqlite-hurd.patch"))
(sha256
(base32
"1bj936svd8i5g25xd1bj52hj4zca01fgl3sqkj86z9q5pkz4wa32"))))
(build-system gnu-build-system)
(inputs `(("readline" ,readline)))
(native-inputs (if (hurd-target?)
;; TODO move into origin on the next rebuild cycle.
`(("hurd-locking-mode.patch"
,@(search-patches "sqlite-hurd.patch")))
'()))
(outputs '("out" "static"))
(arguments
`(#:configure-flags
@ -86,18 +82,6 @@ (define-public sqlite
;; Column metadata is required by GNU Jami and Qt, et.al.
"-DSQLITE_ENABLE_COLUMN_METADATA"))
#:phases (modify-phases %standard-phases
;; TODO: remove in the next rebuild cycle
,@(if (hurd-target?)
`((add-after 'unpack 'patch-sqlite/hurd
(lambda* (#:key inputs native-inputs
#:allow-other-keys)
(let ((patch (assoc-ref
(if ,(%current-target-system)
native-inputs
inputs)
"hurd-locking-mode.patch")))
(invoke "patch" "-p1" "--force" "-i" patch)))))
'())
(add-after 'install 'move-static-library
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))