ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-26 22:38:07 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: vsftpd: Honour upstream make flags.

Browse source 
* gnu/packages/ftp.scm (vsftpd)[arguments]: Add a new 'append-make-flags
phase.  Remove our now redundant "-pie" from LDFLAGS.
This commit is contained in:
Tobias Geerinckx-Rice 2021-07-02 04:40:01 +02:00
parent a841d8e8b3
commit 4049fa8e52
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

@ -270,10 +270,17 @@ (define-public vsftpd
(build-system gnu-build-system)
(arguments
`(#:make-flags
(list "LDFLAGS=-lcap -lcrypt -lpam -pie")
(list "LDFLAGS=-lcap -lcrypt -lpam")
#:tests? #f ; no test suite
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'append-make-flags
(lambda _
(substitute* "Makefile"
(("(CFLAGS|LDFLAGS)[[:blank:]]*=" _ variable)
(format #f "UPSTREAM_~a +=" variable))
(("\\$\\((CFLAGS|LDFLAGS)\\)" _ variable)
(format #f "$(UPSTREAM_~a) $(~@*~a)" variable)))))
(add-after 'unpack 'patch-installation-directory
(lambda* (#:key outputs #:allow-other-keys)
(substitute* "Makefile"