nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gnu: mariadb: Move unbundle substitutions to source snippet. 

* gnu/packages/databases.scm (mariadb)[source](snippet): Add two substitutions
from ...
[arguments]: The 'unbundle' phase here.  Rename to 'fix-pcre-detection.
This commit is contained in:
Marius Bakke 2018-09-09 13:22:43 +02:00
parent 1d957c79b6
commit 4333d48a82
No known key found for this signature in database
GPG Key ID: A2A06DF2A33A54FA
1 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
gnu/packages/databases.scm
View File

@ -636,6 +636,13 @@ Language.")
'(begin '(begin
;; Delete bundled snappy and xz. ;; Delete bundled snappy and xz.
(delete-file-recursively "storage/tokudb/PerconaFT/third_party") (delete-file-recursively "storage/tokudb/PerconaFT/third_party")
(substitute* "storage/tokudb/PerconaFT/CMakeLists.txt"
;; This file checks that the bundled sources are present and
;; declares build procedures for them.
(("^include\\(TokuThirdParty\\)") ""))
(substitute* "storage/tokudb/PerconaFT/ft/CMakeLists.txt"
;; Don't attempt to use the procedures we just removed.
((" build_lzma build_snappy") ""))
;; Preserve CMakeLists.txt for these. ;; Preserve CMakeLists.txt for these.
(for-each (lambda (file) (for-each (lambda (file)
@ -679,7 +686,7 @@ Language.")
"-DINSTALL_SHAREDIR=share") "-DINSTALL_SHAREDIR=share")
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after 'unpack 'unbundle (add-after 'unpack 'fix-pcre-detection
(lambda _ (lambda _
;; The bundled PCRE in MariaDB has a patch that was upstreamed ;; The bundled PCRE in MariaDB has a patch that was upstreamed
;; in version 8.34. Unfortunately the upstream patch behaves ;; in version 8.34. Unfortunately the upstream patch behaves
@ -688,16 +695,6 @@ Language.")
;; XXX: Consider patching PCRE instead. ;; XXX: Consider patching PCRE instead.
(substitute* "cmake/pcre.cmake" (substitute* "cmake/pcre.cmake"
((" OR NOT PCRE_STACK_SIZE_OK") "")) ((" OR NOT PCRE_STACK_SIZE_OK") ""))
(substitute* "storage/tokudb/PerconaFT/ft/CMakeLists.txt"
;; Remove dependency on these CMake targets.
((" build_lzma build_snappy") ""))
(substitute* "storage/tokudb/PerconaFT/CMakeLists.txt"
;; This file checks that the bundled sources are present and
;; declares build procedures for them. We don't need that.
(("^include\\(TokuThirdParty\\)") ""))
#t)) #t))
(add-after 'unpack 'adjust-tests (add-after 'unpack 'adjust-tests
(lambda _ (lambda _