[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
02/04: gnu: vsftpd: Honour upstream make flags.
From: |
guix-commits |
Subject: |
02/04: gnu: vsftpd: Honour upstream make flags. |
Date: |
Fri, 2 Jul 2021 01:15:35 -0400 (EDT) |
nckx pushed a commit to branch master
in repository guix.
commit 4049fa8e52ced1fab2d6d013ffa45e819e3c8676
Author: Tobias Geerinckx-Rice <me@tobias.gr>
AuthorDate: Fri Jul 2 04:40:01 2021 +0200
gnu: vsftpd: Honour upstream make flags.
* gnu/packages/ftp.scm (vsftpd)[arguments]: Add a new 'append-make-flags
phase. Remove our now redundant "-pie" from LDFLAGS.
---
gnu/packages/ftp.scm | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/ftp.scm b/gnu/packages/ftp.scm
index f8ac54e..c79991e 100644
--- a/gnu/packages/ftp.scm
+++ b/gnu/packages/ftp.scm
@@ -270,10 +270,17 @@ directory comparison and more.")
(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"