From e6fd51a36ea1884c0ab56d24d41023594d4d2f3e Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice <me@tobias.gr> Date: Fri, 2 Jul 2021 05:20:49 +0200 Subject: gnu: vsftpd: Properly enable the SSL support. * gnu/packages/ftp.scm (vsftpd)[arguments]: Remove (questionable?) "-lcrypt" from LDFLAGS. #define VSF_BUILD_SSL in a new 'build-SSL phase instead. --- gnu/packages/ftp.scm | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'gnu/packages/ftp.scm') diff --git a/gnu/packages/ftp.scm b/gnu/packages/ftp.scm index 68424c1591..481863bf33 100644 --- a/gnu/packages/ftp.scm +++ b/gnu/packages/ftp.scm @@ -272,11 +272,18 @@ (define-public vsftpd (arguments `(#:make-flags (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") #:tests? #f ; no test suite #: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 (lambda _ (substitute* "Makefile" -- cgit v1.2.3