me/guix
Archived
1
0
Fork 0
Code Activity

gnu: ppp: Fix cross-compilation.

Browse source 
* gnu/packages/samba.scm (ppp)[arguments]: Use G-Expressions. Remove
unused substitution. Fix OpenSSL and libpcap include paths.

Signed-off-by: Guillaume Le Vaillant <glv@posteo.net>
This commit is contained in:
Jean-Pierre De Jesus DIAZ 2022-06-22 20:29:05 +02:00 • committed by Guillaume Le Vaillant
parent 8a35479f26
commit aae46e30d9
No known key found for this signature in database
GPG key ID: 6BE8208ADF21FE3F
1 changed files with 17 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
gnu/packages/samba.scm
View file

@ -10,6 +10,7 @@
;;; Copyright © 2019 Rutger Helling <rhelling@mykolab.com> ;;; Copyright © 2019 Rutger Helling <rhelling@mykolab.com>
;;; Copyright © 2020 Pierre Langlois <pierre.langlois@gmx.com> ;;; Copyright © 2020 Pierre Langlois <pierre.langlois@gmx.com>
;;; Copyright © 2020, 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com> ;;; Copyright © 2020, 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2022 Jean-Pierre De Jesus DIAZ <me@jeandudey.tech>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -469,23 +470,22 @@ key-value pair databases and a real LDAP database.")
"1bhhksdclsnkw54a517ndrw55q5zljjbh9pcqz1z4a2z2flxpsgk")))) "1bhhksdclsnkw54a517ndrw55q5zljjbh9pcqz1z4a2z2flxpsgk"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:tests? #f ; no check target (list #:tests? #f ;; No "check" target
#:make-flags '("CC=gcc") #:make-flags #~(list (string-append "CC=" #$(cc-for-target)))
#:phases #:phases
(modify-phases %standard-phases #~(modify-phases %standard-phases
(add-before 'configure 'patch-Makefile (add-before 'configure 'patch-Makefile
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(let ((libc (assoc-ref inputs "libc")) (let ((openssl (assoc-ref inputs "openssl"))
(openssl (assoc-ref inputs "openssl")) (libpcap (assoc-ref inputs "libpcap")))
(libpcap (assoc-ref inputs "libpcap"))) (substitute* "pppd/Makefile.linux"
(substitute* "pppd/Makefile.linux" (("/usr/include/openssl")
(("/usr/include/crypt\\.h") (string-append openssl "/include"))
(string-append libc "/include/crypt.h")) (("-DPPP_FILTER")
(("/usr/include/openssl") (string-append "-DPPP_FILTER -I" libpcap "/include")))
(string-append openssl "/include/openssl")) (substitute* "pppd/pppcrypt.h"
(("/usr/include/pcap-bpf.h") (("des\\.h") "openssl/des.h")))
(string-append libpcap "/include/pcap-bpf.h"))) #t)))))
#t))))))
(inputs (inputs
(list libpcap (list libpcap
(@ (gnu packages tls) openssl))) (@ (gnu packages tls) openssl)))