TakeV/guix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

gnu: ceph: Install headers to the "lib" output.

Browse source 
The previous provision for this has been defunct since version 12.

* gnu/packages/storage.scm (ceph)[arguments]: Remove obsolete substitution in
favor of a configure flag.
This commit is contained in:
Marius Bakke 2019-03-15 17:48:35 +01:00
parent 7e148c20d2
commit 02a4efb238
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
1 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
gnu/packages/storage.scm
View file

@ -93,6 +93,8 @@ (define-public ceph
(libdir (string-append lib "/lib"))) (libdir (string-append lib "/lib")))
(list (string-append "-DCMAKE_INSTALL_PREFIX=" out) (list (string-append "-DCMAKE_INSTALL_PREFIX=" out)
(string-append "-DCMAKE_INSTALL_LIBDIR=" libdir) (string-append "-DCMAKE_INSTALL_LIBDIR=" libdir)
(string-append "-DCMAKE_INSTALL_INCLUDEDIR="
lib "/include")
;; We need both libdir and libdir/ceph in RUNPATH. ;; We need both libdir and libdir/ceph in RUNPATH.
(string-append "-DCMAKE_INSTALL_RPATH=" (string-append "-DCMAKE_INSTALL_RPATH="
libdir ";" libdir "/ceph") libdir ";" libdir "/ceph")
@ -127,11 +129,6 @@ (define-public ceph
(let ((out (assoc-ref outputs "out")) (let ((out (assoc-ref outputs "out"))
(lib (assoc-ref outputs "lib"))) (lib (assoc-ref outputs "lib")))
;; Make header files follow the dynamic libraries.
(substitute* "src/include/CMakeLists.txt"
(("DESTINATION include")
(string-append "DESTINATION " lib "/include")))
(substitute* "cmake/modules/Distutils.cmake" (substitute* "cmake/modules/Distutils.cmake"
;; Prevent creation of Python eggs. ;; Prevent creation of Python eggs.
(("setup.py install") (("setup.py install")