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

gnu: rocksdb: Don't build static library. 

* gnu/packages/databases.scm (rocksdb)[arguments]<#:phases>: Add new Makefile
substitution. Remove 'delete-static-library' phase. Adjust
'build-release-libraries' phase to match.
<#:make-flags>: Remove redundant flag.
This commit is contained in:
Marius Bakke 2017-04-14 21:03:31 +02:00
parent bf144793ae
commit f91c677c03
No known key found for this signature in database
GPG Key ID: A2A06DF2A33A54FA
1 changed files with 12 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
gnu/packages/databases.scm
View File

@ -576,9 +576,6 @@ types are supported, as is encryption.")
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:make-flags (list "CC=gcc" '(#:make-flags (list "CC=gcc"
;; Make the resulting library position-independent so the
;; static version can be included in shared objects.
"EXTRA_CXXFLAGS=-fPIC"
(string-append "INSTALL_PATH=" (string-append "INSTALL_PATH="
(assoc-ref %outputs "out"))) (assoc-ref %outputs "out")))
#:phases #:phases
@ -587,6 +584,9 @@ types are supported, as is encryption.")
(lambda _ (lambda _
(substitute* "Makefile" (substitute* "Makefile"
(("build_tools/gnu_parallel") "parallel") (("build_tools/gnu_parallel") "parallel")
;; Don't depend on the static library when installing.
(("install: install-static")
"install: install-shared")
(("#!/bin/sh") (string-append "#!" (which "sh")))) (("#!/bin/sh") (string-append "#!" (which "sh"))))
#t)) #t))
(delete 'configure) (delete 'configure)
@ -600,26 +600,15 @@ types are supported, as is encryption.")
(("^[[:blank:]]+env_test[[:blank:]]+\\\\") "\\") (("^[[:blank:]]+env_test[[:blank:]]+\\\\") "\\")
(("^[[:blank:]]+persistent_cache_test[[:blank:]]+\\\\") "\\")) (("^[[:blank:]]+persistent_cache_test[[:blank:]]+\\\\") "\\"))
#t)) #t))
(add-after (add-after 'check 'build-release-libraries
'check 'build-release-libraries ;; The default build target is a debug build for tests. The
;; The 'check' target depends on the default target which is compiled ;; install target depends on "shared_lib" and "static_lib"
;; with debug symbols. The 'install' target depends on shared and ;; targets for release builds so we build them here for clarity.
;; static release targets so we build them here for clarity. ;; TODO: Add debug output.
;; TODO: Add debug output. (lambda* (#:key (make-flags '()) #:allow-other-keys)
(lambda* (#:key (make-flags '()) #:allow-other-keys) ;; Prevent the build from adding machine-specific optimizations.
;; Prevent the build from adding machine-specific optimizations. (setenv "PORTABLE" "1")
;; This does not work if passed as a make flag... (zero? (apply system* "make" "shared_lib" make-flags)))))))
(setenv "PORTABLE" "1")
(and (zero? (apply system* "make" "static_lib" make-flags))
(zero? (apply system* "make" "shared_lib" make-flags)))))
(add-after 'install 'delete-static-library
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(lib (string-append out "/lib")))
(for-each (lambda (file)
(delete-file file))
(find-files lib "\\.l?a$"))
#t))))))
(native-inputs (native-inputs
`(("parallel" ,parallel) `(("parallel" ,parallel)
("perl" ,perl) ("perl" ,perl)