Bug 171386 - [PATCH] ftp/vsftpd: removea the unnecessary "-Wl"
Summary: [PATCH] ftp/vsftpd: removea the unnecessary "-Wl"
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: Dirk Meyer
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2012-09-06 18:40 UTC by Hung-te Liang
Modified: 2012-09-27 19:54 UTC (History)
1 user (show)

See Also:


Attachments
vsftpd-ssl-3.0.0.patch (602 bytes, patch)
2012-09-06 18:40 UTC, Hung-te Liang
no flags Details | Diff
vsftpd-3.0.0.patch (795 bytes, patch)
2012-09-07 03:23 UTC, Hung-te Liang
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Hung-te Liang 2012-09-06 18:40:01 UTC
Remove the unnecessary argument in last change.

Port maintainer (dinoex@FreeBSD.org) is cc'd.

Generated with FreeBSD Port Tools 0.99_6 (mode: change, diff: ports)
Comment 1 Edwin Groothuis freebsd_committer freebsd_triage 2012-09-06 18:40:19 UTC
Responsible Changed
From-To: freebsd-ports-bugs->dinoex

Over to maintainer (via the GNATS Auto Assign Tool)
Comment 2 Hung-te Liang 2012-09-07 03:23:38 UTC
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" >> \
Comment 3 dfilter service freebsd_committer freebsd_triage 2012-09-27 19:14:45 UTC
Author: dinoex
Date: Thu Sep 27 18:14:34 2012
New Revision: 304968
URL: http://svn.freebsd.org/changeset/ports/304968

Log:
  - cleanup linkflags
  PR:		171386

Modified:
  head/ftp/vsftpd/Makefile

Modified: head/ftp/vsftpd/Makefile
==============================================================================
--- head/ftp/vsftpd/Makefile	Thu Sep 27 17:01:15 2012	(r304967)
+++ head/ftp/vsftpd/Makefile	Thu Sep 27 18:14:34 2012	(r304968)
@@ -72,7 +72,7 @@ do-configure:
 		-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|	-Wl,-s|	${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" >> \
_______________________________________________
svn-ports-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-ports-all
To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
Comment 4 Dirk Meyer freebsd_committer freebsd_triage 2012-09-27 19:53:32 UTC
State Changed
From-To: open->closed

committed with changes, thanks.