diff options
| author | Tobias Geerinckx-Rice <me@tobias.gr> | 2021-07-02 04:40:01 +0200 |
|---|---|---|
| committer | Tobias Geerinckx-Rice <me@tobias.gr> | 2021-07-02 07:14:09 +0200 |
| commit | 4049fa8e52ced1fab2d6d013ffa45e819e3c8676 (patch) | |
| tree | 72dd1e78ce32be35e1eb41b10e9d4417bbe9f4a2 | |
| parent | a841d8e8b3f300953061383e7caf5bc1f1585a35 (diff) | |
| download | guix-4049fa8e52ced1fab2d6d013ffa45e819e3c8676.tar guix-4049fa8e52ced1fab2d6d013ffa45e819e3c8676.tar.gz | |
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.
| -rw-r--r-- | gnu/packages/ftp.scm | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/gnu/packages/ftp.scm b/gnu/packages/ftp.scm index f8ac54eb4d..c79991e3af 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" |