me/guix
Archived
1
0
Fork 0
Code Activity

gnu: libcap: Fix cross-compilation build failures.

Browse source 
* gnu/packages/linux.scm
  (libcap)[arguments]<#:phases>{configure}: Don't use non-existent
  '%output' when cross-compiling.
  (libcap)[arguments]<#:make-flags>: Set "CROSS_COMPILE" and "BUILD_CC"
  when cross-compiling.
This commit is contained in:
Maxime Devos 2021-08-24 09:37:01 +02:00 • committed by Mathieu Othacehe
parent 04380925ea
commit 5203a3f123
No known key found for this signature in database
GPG key ID: 8354763531769CA6
1 changed files with 25 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
gnu/packages/linux.scm
View file

@ -2996,20 +2996,32 @@ configuration (iptunnel, ipmaddr).")
(base32 (base32
"1ych13qc1mvzv8iscbims5b317vxcmy5ffpmfy98zk7bgamz62b6")))) "1ych13qc1mvzv8iscbims5b317vxcmy5ffpmfy98zk7bgamz62b6"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments '(#:phases (arguments `(#:phases
(modify-phases %standard-phases ,#~(modify-phases %standard-phases
(replace 'configure (replace 'configure
;; Add $libdir to the RUNPATH of executables. ;; Add $libdir to the RUNPATH of executables.
(lambda _ (lambda _
(substitute* "Make.Rules" (substitute* "Make.Rules"
(("LDFLAGS \\?= #-g") (("LDFLAGS \\?= #-g")
(string-append "LDFLAGS ?= -Wl,-rpath=" (string-append "LDFLAGS ?= -Wl,-rpath="
%output "/lib")))))) ;; TODO(core-updates): Use #$output
;; unconditionally.
#$(if (%current-target-system)
#~#$output
'%output)
"/lib"))))))
#:test-target "test" #:test-target "test"
#:make-flags (list "lib=lib" #:make-flags
(string-append "prefix=" (list "lib=lib"
(assoc-ref %outputs "out")) (string-append "prefix=" (assoc-ref %outputs "out"))
"RAISE_SETFCAP=no"))) "RAISE_SETFCAP=no"
;; Tell the makefile to use TARGET-gcc and friends
;; when cross-compiling.
,@(if (%current-target-system)
`(,(string-append "CROSS_COMPILE="
(%current-target-system) "-")
"BUILD_CC=gcc")
'()))))
(native-inputs `(("perl" ,perl))) (native-inputs `(("perl" ,perl)))
(supported-systems (delete "i586-gnu" %supported-systems)) (supported-systems (delete "i586-gnu" %supported-systems))
(home-page "https://sites.google.com/site/fullycapable/") (home-page "https://sites.google.com/site/fullycapable/")