Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix two bugs reported by Simon Burge: 1) USE_FORT and USE_SSP should be

Browse Source 
disabled on platforms where GCC doesn't support -fstack-protector.  2) The
libssl Makefile had a hard-coded USE_FORT=yes.
This commit is contained in:
tls 2007-05-29 13:55:31 +00:00
parent b0698fecd5
commit 64e3562f4f
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/libssl/Makefile
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.14 2007/05/28 12:06:22 tls Exp $
# $NetBSD: Makefile,v 1.15 2007/05/29 13:55:31 tls Exp $
# RCSid:
# Id: Makefile,v 1.33 1998/11/11 11:53:53 sjg Exp
@ -18,7 +18,7 @@
.include <bsd.own.mk>
USE_FORT=yes # cryptographic software and network library
USE_FORT?=yes # cryptographic software and network library
# XXX There's a bit of work to do before we can enable warnings.
WARNS=0

7
share/mk/bsd.sys.mk
View File

@ -1,4 +1,4 @@
# $NetBSD: bsd.sys.mk,v 1.144 2007/05/29 04:56:34 tls Exp $
# $NetBSD: bsd.sys.mk,v 1.145 2007/05/29 13:55:31 tls Exp $
#
# Build definitions used for NetBSD source tree builds.
@ -38,6 +38,9 @@ CPPFLAGS+= ${AUDIT:D-D__AUDIT__}
CFLAGS+= ${CWARNFLAGS} ${NOGCCERROR:D:U-Werror}
LINTFLAGS+= ${DESTDIR:D-d ${DESTDIR}/usr/include}
.if (${MACHINE_ARCH} != "alpha") && (${MACHINE_ARCH} != "hppa") && \
(${MACHINE_ARCH} != "mips")
.if defined(USE_FORT) && (${USE_FORT} != "no")
USE_SSP= yes
.if !defined(KERNSRCDIR) && !defined(KERN) # not for kernels nor kern modules
@ -57,6 +60,8 @@ LDADD+= -lssp
COPTS+= -fstack-protector -Wstack-protector --param ssp-buffer-size=1
.endif
.endif
.if defined(MKSOFTFLOAT) && (${MKSOFTFLOAT} != "no")
COPTS+= -msoft-float
FOPTS+= -msoft-float