mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-02-08 12:01:56 +00:00
Code Issues Releases Activity

- respect INSTALL_PROGRAM, STRIP and custom optimisations in CFLAGS

Browse Source 
PR:		163550
This commit is contained in:
Dirk Meyer 2012-09-06 14:29:59 +00:00
parent 7f16bac99e
commit 45da3ca8be
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=303756
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ftp/vsftpd/Makefile
View File

@ -44,6 +44,11 @@ LDFLAGS+= -L${OPENSSLLIB}
EXTRA_PATCHES+= ${FILESDIR}/pidfile.patch EXTRA_PATCHES+= ${FILESDIR}/pidfile.patch
.endif .endif
VSFTPD_OPTIMIZED= ${CFLAGS:M-O}
.if defined(CFLAGS) && !empty(VSFTPD_OPTIMIZED)
VSFTPD_NO_OPTIMIZED= -e "s| -O2 ||"
.endif
# BROKEN on FreeBSD with undefined reference to `__stack_chk_fail_local' # BROKEN on FreeBSD with undefined reference to `__stack_chk_fail_local'
LDFLAGS+= -lssp_nonshared LDFLAGS+= -lssp_nonshared
@ -58,16 +63,16 @@ do-configure:
"s|#undef VSF_BUILD_TCPWRAPPERS|#define VSF_BUILD_TCPWRAPPERS 1|" \ "s|#undef VSF_BUILD_TCPWRAPPERS|#define VSF_BUILD_TCPWRAPPERS 1|" \
${WRKSRC}/builddefs.h ${WRKSRC}/builddefs.h
.endif .endif
${REINPLACE_CMD} -e "s|^listen=|#listen=|" \ ${REINPLACE_CMD} -e "s|^listen=.*|listen=NO|" \
-e "s|/etc/vsftpd.conf|${PREFIX}/etc/vsftpd.conf|" \ -e "s|/etc/vsftpd.conf|${PREFIX}/etc/vsftpd.conf|" \
${WRKSRC}/defs.h ${WRKSRC}/vsftpd.conf ${WRKSRC}/defs.h ${WRKSRC}/vsftpd.conf
${REINPLACE_CMD} -e "s|/etc/v|${PREFIX}/etc/v|" \ ${REINPLACE_CMD} -e "s|/etc/v|${PREFIX}/etc/v|" \
${WRKSRC}/vsftpd.8 ${WRKSRC}/vsftpd.conf.5 ${WRKSRC}/tunables.c ${WRKSRC}/vsftpd.8 ${WRKSRC}/vsftpd.conf.5 ${WRKSRC}/tunables.c
${REINPLACE_CMD} \ ${REINPLACE_CMD} ${VSFTPD_NO_OPTIMIZED} \
-e "s|^CC = gcc|CC = ${CC}|" \ -e "s|^CC = gcc|CC = ${CC}|" \
-e "s|^CFLAGS =|CFLAGS = ${CFLAGS}|" \ -e "s|^CFLAGS =|CFLAGS = ${CFLAGS}|" \
-e "s|^INSTALL =|INSTALL = ${INSTALL_PROGRAM}|" \ -e "s|$$(INSTALL) -m 755=|$${INSTALL_PROGRAM}|" \
-e "s| -Wl,-s| -Wl,-s ${LDFLAGS:S/-rpath=/-Wl,-rpath,/g}|" \ -e "s| -Wl,-s| -Wl ${LDFLAGS:S/-rpath=/-Wl,-rpath,/g}|" \
${WRKSRC}/Makefile ${WRKSRC}/Makefile
${REINPLACE_CMD} -e '/-lutil/d' ${WRKSRC}/vsf_findlibs.sh ${REINPLACE_CMD} -e '/-lutil/d' ${WRKSRC}/vsf_findlibs.sh
@${ECHO_CMD} "secure_chroot_dir=${PREFIX}/share/vsftpd/empty" >> \ @${ECHO_CMD} "secure_chroot_dir=${PREFIX}/share/vsftpd/empty" >> \