Attachment 120704 Details for Bug 163550 – cc_cflags_strip.diff

[patch] cc_cflags_strip.diff

cc_cflags_strip.diff (text/plain), 3.31 KB, created by Jan Beich on 2011-12-23 00:40:04 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jan Beich

Created: 2011-12-23 00:40:04 UTC

Size: 3.31 KB

patch

obsolete

>Index: ftp/vsftpd/Makefile
>===================================================================
>RCS file: /a/.csup/ports/ftp/vsftpd/Makefile,v
>retrieving revision 1.48
>diff -u -p -r1.48 Makefile
>--- ftp/vsftpd/Makefile	23 Sep 2011 22:22:32 -0000	1.48
>+++ ftp/vsftpd/Makefile	23 Dec 2011 00:19:51 -0000
>@@ -23,8 +23,6 @@ DOCFILES=	AUDIT BENCHMARKS BUGS Changelo
> 		README README.security README.ssl REFS REWARD \
> 		SIZE SPEED TODO TUNING
> 
>-LDFLAGS+=	-lwrap
>-
> OPTIONS=	RC_NG		"install RC_NG script"		off \
> 		VSFTPD_SSL	"Include support for SSL"	off \
> 		PIDFILE		"unofficial support for pidfile"	off
>@@ -50,10 +48,11 @@ do-configure:
> 	${REINPLACE_CMD} -e "s|/etc/vsftpd.conf|${PREFIX}/etc/vsftpd.conf|" \
> 		${WRKSRC}/defs.h ${WRKSRC}/vsftpd.conf
> 	${REINPLACE_CMD} \
>-		-e "s|^CC 	=	gcc|CC	= ${CC}|" \
>-		-e "s|^CFLAGS	=|CFLAGS	= ${CFLAGS}|" \
>-		-e "s|	-Wl,-s| -Wl,-s ${LDFLAGS}|" \
>+		-e '/^CC/s/=/?=/' \
>+		-e '/^CFLAGS/{s/=/+=/;s/-O[0-9]//;}' \
>+		-e '/^LINK/s/=.*/=/' \
> 		${WRKSRC}/Makefile
>+	${REINPLACE_CMD} -e '/-lutil/d' ${WRKSRC}/vsf_findlibs.sh
> 	${REINPLACE_CMD} -e \
> 		"s|#undef VSF_BUILD_TCPWRAPPERS|#define VSF_BUILD_TCPWRAPPERS 1|" \
> 		${WRKSRC}/builddefs.h
>Index: ftp/vsftpd-ext/Makefile
>===================================================================
>RCS file: /a/.csup/ports/ftp/vsftpd-ext/Makefile,v
>retrieving revision 1.5
>diff -u -p -r1.5 Makefile
>--- ftp/vsftpd-ext/Makefile	21 Dec 2011 13:18:23 -0000	1.5
>+++ ftp/vsftpd-ext/Makefile	23 Dec 2011 00:20:22 -0000
>@@ -28,8 +28,6 @@ DOCFILES=	AUDIT BENCHMARKS BUGS Changelo
> 		README README.security README.ssl REFS REWARD \
> 		SIZE SPEED TODO TUNING
> 
>-LDFLAGS+=	-lwrap
>-
> OPTIONS=	RC_SCRIPT	"install RC_SCRIPT"		on \
> 		VSFTPD_SSL	"Include support for SSL"	off
> 
>@@ -53,10 +51,12 @@ do-configure:
> 	${REINPLACE_CMD} -e "s|/etc/vsftpd.conf|${PREFIX}/etc/vsftpd.conf|" \
> 		${WRKSRC}/defs.h ${WRKSRC}/vsftpd.conf
> 	${REINPLACE_CMD} \
>-		-e "s|^CC 	=	gcc|CC	= ${CC}|" \
>-		-e "s|^CFLAGS	=|CFLAGS	= ${CFLAGS}|" \
>-		-e "s|	-Wl,-s| -Wl,-s ${LDFLAGS}|" \
>+		-e '/^CC/s/=/?=/' \
>+		-e '/^CFLAGS/{s/=/+=/;s/-O[0-9]//;}' \
>+		-e '/^LIBS/s|=.*|= `./vsf_findlibs.sh`|' \
>+		-e '/^LINK/s/=.*/=/' \
> 		${WRKSRC}/Makefile
>+	${REINPLACE_CMD} -e '/-lutil/d' ${WRKSRC}/vsf_findlibs.sh
> 	${REINPLACE_CMD} -e \
> 		"s|#undef VSF_BUILD_TCPWRAPPERS|#define VSF_BUILD_TCPWRAPPERS 1|" \
> 		${WRKSRC}/builddefs.h
>Index: ftp/vsftpd-ext/files/patch-Makefile
>===================================================================
>RCS file: ftp/vsftpd-ext/files/patch-Makefile
>diff -N ftp/vsftpd-ext/files/patch-Makefile
>--- ftp/vsftpd-ext/files/patch-Makefile	21 Dec 2011 13:19:37 -0000	1.1
>+++ /dev/null	1 Jan 1970 00:00:00 -0000
>@@ -1,14 +0,0 @@
>---- ./Makefile.orig	2011-12-13 10:14:07.000000000 +0200
>-+++ ./Makefile	2011-12-13 10:15:30.000000000 +0200
>-@@ -3,9 +3,9 @@
>- INSTALL	=       install
>- IFLAGS  = -idirafter dummyinc
>- #CFLAGS = -g
>--CFLAGS	=       -O2 -Wall -W -Wshadow #-pedantic -Werror -Wconversion
>-+CFLAGS	= -O2 -pipe -march=prescott -fno-strict-aliasing       -O2 -Wall -W -Wshadow #-pedantic -Werror -Wconversion
>- 
>--LIBS	=       -lcap -ldl -lcrypt    -lpam    -lwrap -lnsl    -lssl -lcrypto
>-+LIBS=	-lpam
>- #                                     |        |               + VSF_BUILD_SSL
>- #                                     |        + VSF_BUILD_TCPWRAPPERS
>- #                                     + VSF_BUILD_PAM

Actions: View | Diff

Attachments on bug 163550: 120704