From bbab7f59e9630416397189df70ec133bdd690e38 Mon Sep 17 00:00:00 2001 From: Muhammad Moinur Rahman Date: Sat, 30 Sep 2023 22:44:19 +0200 Subject: */*: Sunset 12.4-RELEASE/12-STABLE from ports tree - Remove all references to defunct ARCH arm - Remove all references to defunct ARCH sparc64 - Remove x11-drivers/xf86-video-sunffb which requires defunct sparc64 ARCH - Remove sysutils/afbinit requires defunct sparc64 ARCH - Remove all references to bktr driver - Remove all references to defunct FreeBSD_12 - Remove all references to OSVERSION/OSREL corresponding to 12 - Remove conditionals in Mk/Uses/cabal.mk - Remove sparc reference from Mk/Uses/qt-dist.mk - Remove BROKEN_sparc64/NOT_FOR_ARCH=sparc64 - Remove BROKEN_FreeBSD_12* from: - Remove OpenSSL patches from: - Remove conditional flags for OSVERSION >= 1300000 to fixed flags. Also move conditional flags for non sparc64/arm ARCH to fixed flags. Reviewed by: brooks, jbeich, rene, salvadore Differential Revision: https://reviews.freebsd.org/D42068 --- www/nginx-devel/Makefile | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'www/nginx-devel') diff --git a/www/nginx-devel/Makefile b/www/nginx-devel/Makefile index db5d7e5ade6b..a10ae1556677 100644 --- a/www/nginx-devel/Makefile +++ b/www/nginx-devel/Makefile @@ -151,6 +151,8 @@ HTTP_IMAGE_FILTER_VARS= DSO_BASEMODS+=http_image_filter_module HTTP_MP4_CONFIGURE_ON= --with-http_mp4_module HTTP_PERL_CATEGORIES= perl5 HTTP_PERL_USES= perl5 +# Fix build failure on clang >= 12 +HTTP_PERL_CFLAGS= -Wno-compound-token-split-by-macro HTTP_PERL_VARS= DSO_BASEMODS+=http_perl_module HTTP_RANDOM_INDEX_CONFIGURE_ON= --with-http_random_index_module HTTP_REALIP_CONFIGURE_ON= --with-http_realip_module @@ -241,11 +243,6 @@ CFLAGS+= -DNDEBUG CONFIGURE_ENV+= EXTRA_PRE_CXXFLAGS="-std=c++14" .endif -# Fix build failure on clang >= 12 -.if ${PORT_OPTIONS:MHTTP_PERL} && ${OSVERSION} >= 1301000 -CFLAGS+= -Wno-compound-token-split-by-macro -.endif - .if empty(PORT_OPTIONS:MLUA) && empty(PORT_OPTIONS:MMODSECURITY3) && \ empty(PORT_OPTIONS:MPASSENGER) CONFIGURE_ARGS+= --with-ld-opt="-L ${LOCALBASE}/lib" -- cgit v1.2.3