me/guix
Archived
1
0
Fork 0
Code Activity

gnu: vsftpd: Properly enable the SSL support.

Browse source 
* gnu/packages/ftp.scm (vsftpd)[arguments]: Remove (questionable?)
"-lcrypt" from LDFLAGS.  #define VSF_BUILD_SSL in a new 'build-SSL phase
instead.
This commit is contained in:
Tobias Geerinckx-Rice 2021-07-02 05:20:49 +02:00
parent 26f31c7c9a
commit e6fd51a36e
No known key found for this signature in database
GPG key ID: 0DB0FF884F556D79
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
gnu/packages/ftp.scm
View file

@ -272,11 +272,18 @@ directory comparison and more.")
(arguments (arguments
`(#:make-flags `(#:make-flags
(list (string-append "CC=" ,(cc-for-target)) (list (string-append "CC=" ,(cc-for-target))
"LDFLAGS=-lcap -lcrypt -lpam" ;; vsf_findlibs.sh looks only for hard-coded {/usr,}/lib file names
;; that will never exist on Guix. Manage libraries ourselves.
"LDFLAGS=-lcap -lpam"
"INSTALL=install -D") "INSTALL=install -D")
#:tests? #f ; no test suite #:tests? #f ; no test suite
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after 'unpack 'build-SSL
(lambda _
(substitute* "builddefs.h"
(("#undef (VSF_BUILD_SSL)" _ symbol)
(string-append "#define " symbol)))))
(add-after 'unpack 'append-make-flags (add-after 'unpack 'append-make-flags
(lambda _ (lambda _
(substitute* "Makefile" (substitute* "Makefile"