svn commit: r499897 - in head: Mk audio/linux-skype_oss_wrapper devel/linux_libusb devel/mingw32-libyaml devel/psptoolchain-gcc-stage1 devel/psptoolchain-newlib devel/psptoolchain-pspsdk-stage2 lan...
Jan Beich
jbeich at FreeBSD.org
Wed Apr 24 19:15:09 UTC 2019
Author: jbeich
Date: Wed Apr 24 19:15:05 2019
New Revision: 499897
URL: https://svnweb.freebsd.org/changeset/ports/499897
Log:
Switch to -fstack-protector-strong and enable on more architectures
PR: 237273
Exp-run by: antoine
Approved by: portmgr (antoine)
Differential Revision: https://reviews.freebsd.org/D19907
Modified:
head/Mk/bsd.gecko.mk (contents, props changed)
head/Mk/bsd.ssp.mk (contents, props changed)
head/audio/linux-skype_oss_wrapper/Makefile (contents, props changed)
head/devel/linux_libusb/Makefile (contents, props changed)
head/devel/mingw32-libyaml/Makefile (contents, props changed)
head/devel/psptoolchain-gcc-stage1/Makefile (contents, props changed)
head/devel/psptoolchain-newlib/Makefile (contents, props changed)
head/devel/psptoolchain-pspsdk-stage2/Makefile (contents, props changed)
head/lang/gnu-cobol/Makefile (contents, props changed)
head/lang/mlton/Makefile (contents, props changed)
head/math/gretl/Makefile (contents, props changed)
head/math/mingw32-libgmp/Makefile (contents, props changed)
Modified: head/Mk/bsd.gecko.mk
==============================================================================
--- head/Mk/bsd.gecko.mk Wed Apr 24 18:27:08 2019 (r499896)
+++ head/Mk/bsd.gecko.mk Wed Apr 24 19:15:05 2019 (r499897)
@@ -119,11 +119,6 @@ BUILD_DEPENDS+= rust-cbindgen>=0.6.8:devel/rust-cbindg
MOZ_OPTIONS+= --enable-pie
.endif
-.if ${MOZILLA_VER:R:R} >= 65
-# Let vendor add -fstack-protector-strong on all architectures
-SSP_UNSAFE= yes
-.endif
-
MOZILLA_SUFX?= none
MOZSRC?= ${WRKSRC}
PLISTF?= ${WRKDIR}/plist_files
Modified: head/Mk/bsd.ssp.mk
==============================================================================
--- head/Mk/bsd.ssp.mk Wed Apr 24 18:27:08 2019 (r499896)
+++ head/Mk/bsd.ssp.mk Wed Apr 24 19:15:05 2019 (r499897)
@@ -4,14 +4,9 @@
SSP_Include_MAINTAINER= portmgr at FreeBSD.org
.if !defined(SSP_UNSAFE) && \
- (${ARCH} == i386 || ${ARCH} == amd64)
+ (${MACHINE} != "mips")
# Overridable as a user may want to use -fstack-protector-all
-SSP_CFLAGS?= -fstack-protector
+SSP_CFLAGS?= -fstack-protector-strong
CFLAGS+= ${SSP_CFLAGS}
-LDFLAGS+= -fstack-protector
-# -lssp_nonshared is needed on i386 where /usr/lib/libc.so is not an ldscript
-# This is currently unused XXX
-. if defined(SSP_NEED_NONSHARED)
-LDFLAGS+= -lssp_nonshared
-. endif
+LDFLAGS+= ${SSP_CFLAGS}
.endif
Modified: head/audio/linux-skype_oss_wrapper/Makefile
==============================================================================
--- head/audio/linux-skype_oss_wrapper/Makefile Wed Apr 24 18:27:08 2019 (r499896)
+++ head/audio/linux-skype_oss_wrapper/Makefile Wed Apr 24 19:15:05 2019 (r499897)
@@ -24,6 +24,7 @@ USES= linux
USE_LINUX= base devtools:build
USE_LINUX_PREFIX= yes
# do not define USE_LDCONFIG, it's not for global use
+SSP_CFLAGS?= -fstack-protector # XXX -strong isn't supported by GCC < 4.9
ONLY_FOR_ARCHS= i386 amd64
PLIST_FILES= lib/skype_oss_wrapper/libpulse.so.0
Modified: head/devel/linux_libusb/Makefile
==============================================================================
--- head/devel/linux_libusb/Makefile Wed Apr 24 18:27:08 2019 (r499896)
+++ head/devel/linux_libusb/Makefile Wed Apr 24 19:15:05 2019 (r499897)
@@ -20,6 +20,7 @@ PLIST_FILES= usr/lib/libusb.so \
usr/lib/libusb-0.1.so.4
CC= ${LINUXBASE}/usr/bin/gcc
CFLAGS+= -I${WRKDIR}/sys
+SSP_CFLAGS?= -fstack-protector # XXX -strong isn't supported by GCC < 4.9
MAKE_ARGS+= LIBUSB_GLOBAL_INCLUDE_FILE=libusb_global_linux.h
MAKE_ARGS+= PTHREAD_LIBS="-lpthread -lrt"
MAKE_ARGS+= WITHOUT_SSP=yes
Modified: head/devel/mingw32-libyaml/Makefile
==============================================================================
--- head/devel/mingw32-libyaml/Makefile Wed Apr 24 18:27:08 2019 (r499896)
+++ head/devel/mingw32-libyaml/Makefile Wed Apr 24 19:15:05 2019 (r499897)
@@ -21,6 +21,7 @@ GNU_CONFIGURE_PREFIX= ${PREFIX}/mingw32
CONFIGURE_ARGS= --host="mingw32"
CC= ${PKGNAMEPREFIX}gcc
CFLAGS= -O3 # Override CFLAGS for a cross-build
+SSP_CFLAGS?= -fstack-protector # XXX -strong isn't supported by GCC < 4.9
USES= libtool
.include <bsd.port.mk>
Modified: head/devel/psptoolchain-gcc-stage1/Makefile
==============================================================================
--- head/devel/psptoolchain-gcc-stage1/Makefile Wed Apr 24 18:27:08 2019 (r499896)
+++ head/devel/psptoolchain-gcc-stage1/Makefile Wed Apr 24 19:15:05 2019 (r499897)
@@ -52,6 +52,7 @@ CONFIGURE_ARGS?= --prefix=${PREFIX}/${PSP_GCC_STAGE_PR
--with-ld=${LOCALBASE}/bin/psp-ld \
--with-as=${LOCALBASE}/bin/psp-as \
--mandir=${PREFIX}/man
+SSP_CFLAGS?= -fstack-protector # XXX -strong isn't supported by GCC < 4.9
# Don't install any documentation for psptoolchain's gcc stage 1 - makes no sense.
# Disable installation of .info files and libiberty for both stages.
Modified: head/devel/psptoolchain-newlib/Makefile
==============================================================================
--- head/devel/psptoolchain-newlib/Makefile Wed Apr 24 18:27:08 2019 (r499896)
+++ head/devel/psptoolchain-newlib/Makefile Wed Apr 24 19:15:05 2019 (r499897)
@@ -29,6 +29,7 @@ CONFIGURE_ENV= PATH=${LOCALBASE}/${PSP_GCC_STAGE_PREF
CFLAGS="${CFLAGS:C/(^|[[:space:]])-march=[^[:space:]]*//g} -g"
MAKE_ENV= PATH=${LOCALBASE}/${PSP_GCC_STAGE_PREFIX}/bin:${PATH}
CONFIGURE_ARGS= --prefix=${PREFIX} --target="psp"
+SSP_CFLAGS?= -fstack-protector # XXX -strong isn't supported by GCC < 4.9
# Disable installation of .info files and fix includedir reference.
post-patch:
Modified: head/devel/psptoolchain-pspsdk-stage2/Makefile
==============================================================================
--- head/devel/psptoolchain-pspsdk-stage2/Makefile Wed Apr 24 18:27:08 2019 (r499896)
+++ head/devel/psptoolchain-pspsdk-stage2/Makefile Wed Apr 24 19:15:05 2019 (r499897)
@@ -18,6 +18,7 @@ BUILD_DEPENDS= psp-cpp:devel/psptoolchain-gcc-stage2
# psp-gcc doesn't need -march=... in CFLAGS (e.g. set by CPUTYPE in make.conf)
CONFIGURE_ENV= CFLAGS="${CFLAGS:C/(^|[[:space:]])-march=[^[:space:]]*//g}"
CONFIGURE_ARGS= --prefix=${PREFIX} --with-pspdev="${LOCALBASE}"
+SSP_CFLAGS?= -fstack-protector # XXX -strong isn't supported by GCC < 4.9
PLIST= ${.CURDIR}/pkg-plist
MASTERDIR= ${.CURDIR}/../psptoolchain-pspsdk-stage1
Modified: head/lang/gnu-cobol/Makefile
==============================================================================
--- head/lang/gnu-cobol/Makefile Wed Apr 24 18:27:08 2019 (r499896)
+++ head/lang/gnu-cobol/Makefile Wed Apr 24 19:15:05 2019 (r499897)
@@ -24,6 +24,7 @@ INFO= gnucobol
DATADIR= ${PREFIX}/share/gnucobol
INSTALL_TARGET= install-strip
+SSP_CFLAGS?= -fstack-protector # XXX -strong fails to build
CPPFLAGS+= -I${BDB_INCLUDE_DIR} -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
Modified: head/lang/mlton/Makefile
==============================================================================
--- head/lang/mlton/Makefile Wed Apr 24 18:27:08 2019 (r499896)
+++ head/lang/mlton/Makefile Wed Apr 24 19:15:05 2019 (r499897)
@@ -71,6 +71,7 @@ BUILD_DEPENDS+= wine:emulators/wine \
${LOCALBASE}/mingw32/lib/libgmp.a:math/mingw32-libgmp
RUN_DEPENDS+= mingw32-gcc:devel/mingw32-gcc \
${LOCALBASE}/mingw32/lib/libgmp.a:math/mingw32-libgmp
+SSP_CFLAGS?= -fstack-protector # XXX -strong isn't supported by GCC < 4.9
PLIST_SUB+= MINGW32CROSS=""
.else
Modified: head/math/gretl/Makefile
==============================================================================
--- head/math/gretl/Makefile Wed Apr 24 18:27:08 2019 (r499896)
+++ head/math/gretl/Makefile Wed Apr 24 19:15:05 2019 (r499897)
@@ -27,6 +27,7 @@ USE_LDCONFIG= yes
BINARY_ALIAS= make=${GMAKE}
ALL_TARGET= # empty
+SSP_CFLAGS?= -fstack-protector # XXX -strong crashes mklang on 12.0+ i386
CONFIGURE_ENV= ac_cv_lib_dl_dlopen="" \
LAPACK_LIBS="${LAPACK} ${BLAS}"
Modified: head/math/mingw32-libgmp/Makefile
==============================================================================
--- head/math/mingw32-libgmp/Makefile Wed Apr 24 18:27:08 2019 (r499896)
+++ head/math/mingw32-libgmp/Makefile Wed Apr 24 19:15:05 2019 (r499897)
@@ -23,6 +23,7 @@ GNU_CONFIGURE= yes
CC= ${PKGNAMEPREFIX}gcc
CXX= ${PKGNAMEPREFIX}c++
CFLAGS+= -I/usr/include
+SSP_CFLAGS?= -fstack-protector # XXX -strong isn't supported by GCC < 4.9
CONFIGURE_ENV= MAKEINFO="${MAKEINFO} --no-split" \
PREFIX="${PREFIX}/${GMP_TARG}" \
M4="/usr/bin/m4"
More information about the svn-ports-head
mailing list