From f66a9e0d7fbb73c4360806e7713955fea2cabea2 Mon Sep 17 00:00:00 2001 From: Franco Fichtner Date: Sat, 17 Mar 2018 08:35:23 +0100 Subject: [PATCH] Framework: sync with upstream Taken from: HardenedBSD --- MOVED | 3 ++- Mk/Uses/compiler.mk | 2 +- Templates/config.site | 3 --- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/MOVED b/MOVED index 976fa18d6fbc..6842709ffe67 100644 --- a/MOVED +++ b/MOVED @@ -9305,7 +9305,6 @@ games/libfov||2017-04-30|Has expired: Unfetchable for more than six months (goog games/dcross||2017-04-30|Has expired: Unfetchable for more than six months (google code has gone away) games/lostfeathers||2017-04-30|Has expired: Unfetchable for more than six months (google code has gone away) games/hexglass||2017-04-30|Has expired: Unfetchable for more than six months (google code has gone away) -textproc/ibus-table||2017-04-30|Has expired: Unfetchable for more than six months (google code has gone away) textproc/chm2pdf||2017-04-30|Has expired: Unfetchable for more than six months (google code has gone away) textproc/dtdinst||2017-04-30|Has expired: Unfetchable for more than six months (google code has gone away) textproc/py-xmltv||2017-04-30|Has expired: Unfetchable for more than six months (google code has gone away) @@ -10205,3 +10204,5 @@ finance/electrum2|finance/electrum|2018-03-13|Has expired: Vulnerable legacy por math/py-gsl|math/py-pygsl|2018-03-13|Rename to match PyPI naming www/mediawiki123|www/mediawiki127|2018-03-14|Has expired: Upstream no longer maintained www/mediawiki128|www/mediawiki130|2018-03-14|Has expired: Upstream no longer maintained +sysutils/py-zfs||2018-03-16|Not needed since ZFS 28 +net/freebsd-tftp||2018-03-16|Imported into base in FreeBSD 8.0 diff --git a/Mk/Uses/compiler.mk b/Mk/Uses/compiler.mk index d8a2c97d8a6e..154f00e1001b 100644 --- a/Mk/Uses/compiler.mk +++ b/Mk/Uses/compiler.mk @@ -148,7 +148,7 @@ _LANG=c++ .if defined(CC_OUTPUT_${_CC_hash}_${std:hash}) OUTPUT_${std}= ${CC_OUTPUT_${_CC_hash}_${std:hash}} .else -OUTPUT_${std}!= ${CC} -std=${std} -c -x ${_LANG} /dev/null -o /dev/null 2>&1; echo yes +OUTPUT_${std}!= if ${CC} -std=${std} -c -x ${_LANG} /dev/null -o /dev/null 2>&1; then echo yes; fi; echo CC_OUTPUT_${_CC_hash}_${std:hash}= ${OUTPUT_${std}} PORTS_ENV_VARS+= CC_OUTPUT_${_CC_hash}_${std:hash} .endif diff --git a/Templates/config.site b/Templates/config.site index d4a83e626cec..cb9d929f6793 100644 --- a/Templates/config.site +++ b/Templates/config.site @@ -277,9 +277,7 @@ : ${ac_cv_func_bsearch=yes} : ${ac_cv_func_btowc=yes} : ${ac_cv_func_bzero=yes} -: ${ac_cv_func_cabs=yes} : ${ac_cv_func_calloc=yes} -: ${ac_cv_func_ceil=yes} : ${ac_cv_func_chown=yes} : ${ac_cv_func_clock=yes} : ${ac_cv_func_clock_gettime=yes} @@ -302,7 +300,6 @@ : ${ac_cv_func_ffsl=yes} : ${ac_cv_func_ffsll=yes} : ${ac_cv_func_fileno=yes} -: ${ac_cv_func_floor=yes} : ${ac_cv_func_fls=yes} : ${ac_cv_func_flsl=yes} : ${ac_cv_func_flsll=yes}