Date: Fri, 7 Sep 2012 10:23:38 +0800 From: Hung-Te Liang <lhd@cs.nctu.edu.tw> To: FreeBSD-gnats-submit@FreeBSD.org, freebsd-ports-bugs@FreeBSD.org Subject: Re: ports/171386: [PATCH] ftp/vsftpd: removea the unnecessary "-Wl" Message-ID: <20120907022338.GA65363@cs.nctu.edu.tw> In-Reply-To: <201209061740.q86He1bA039778@freefall.freebsd.org> References: <20120906171742.6CC882E052@BBS.LHD.tw> <201209061740.q86He1bA039778@freefall.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--bp/iNruPH9dso1Pn
Content-Type: text/plain; charset=big5
Content-Disposition: inline
Update:
Remove -Wl,-s in original $LINK only.
--- /usr/ports/ftp/vsftpd/Makefile 2012-09-06 22:29:59.000000000 +0800
+++ Makefile 2012-09-07 10:09:20.000000000 +0800
@@ -1,9 +1,4 @@
-# New ports collection makefile for: vsftpd
-# Date created: 03 Feb 2001
-# Whom: Neil Blakey-Milner
-#
# $FreeBSD: ports/ftp/vsftpd/Makefile,v 1.57 2012/09/06 14:29:59 dinoex Exp $
-#
PORTNAME= vsftpd
PORTVERSION= 3.0.0
@@ -72,7 +67,7 @@
-e "s|^CC = gcc|CC = ${CC}|" \
-e "s|^CFLAGS =|CFLAGS = ${CFLAGS}|" \
-e "s|$$(INSTALL) -m 755=|$${INSTALL_PROGRAM}|" \
- -e "s| -Wl,-s| -Wl ${LDFLAGS:S/-rpath=/-Wl,-rpath,/g}|" \
+ -e "s|^LINK = -Wl,-s|LINK = ${LDFLAGS:S/-rpath=/-Wl,-rpath,/g}|" \
${WRKSRC}/Makefile
${REINPLACE_CMD} -e '/-lutil/d' ${WRKSRC}/vsf_findlibs.sh
@${ECHO_CMD} "secure_chroot_dir=${PREFIX}/share/vsftpd/empty" >> \
--bp/iNruPH9dso1Pn
Content-Type: text/x-diff; charset=big5
Content-Disposition: attachment; filename="vsftpd-3.0.0.patch"
--- /usr/ports/ftp/vsftpd/Makefile 2012-09-06 22:29:59.000000000 +0800
+++ Makefile 2012-09-07 10:09:20.000000000 +0800
@@ -1,9 +1,4 @@
-# New ports collection makefile for: vsftpd
-# Date created: 03 Feb 2001
-# Whom: Neil Blakey-Milner
-#
# $FreeBSD: ports/ftp/vsftpd/Makefile,v 1.57 2012/09/06 14:29:59 dinoex Exp $
-#
PORTNAME= vsftpd
PORTVERSION= 3.0.0
@@ -72,7 +67,7 @@
-e "s|^CC = gcc|CC = ${CC}|" \
-e "s|^CFLAGS =|CFLAGS = ${CFLAGS}|" \
-e "s|$$(INSTALL) -m 755=|$${INSTALL_PROGRAM}|" \
- -e "s| -Wl,-s| -Wl ${LDFLAGS:S/-rpath=/-Wl,-rpath,/g}|" \
+ -e "s|^LINK = -Wl,-s|LINK = ${LDFLAGS:S/-rpath=/-Wl,-rpath,/g}|" \
${WRKSRC}/Makefile
${REINPLACE_CMD} -e '/-lutil/d' ${WRKSRC}/vsf_findlibs.sh
@${ECHO_CMD} "secure_chroot_dir=${PREFIX}/share/vsftpd/empty" >> \
--bp/iNruPH9dso1Pn--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20120907022338.GA65363>