svn commit: r507308 - in head: audio/zam-plugins-lv2 databases/redis-devel devel/py-cbor mail/isync net/parpd security/ossec-hids-local sysutils/fusefs-libs3 sysutils/incron www/varnish6 x11/xsetti...
Mark Linimon
linimon at FreeBSD.org
Thu Jul 25 02:33:15 UTC 2019
Author: linimon
Date: Thu Jul 25 02:33:12 2019
New Revision: 507308
URL: https://svnweb.freebsd.org/changeset/ports/507308
Log:
Prepare for powerpc-on-clang by deleting hard-coded tests for architecture
as a stand-in for "are we running on gcc".
In some cases we only need to specifically test for "are we on the ancient
base gcc", e.g, the usage of 'pragma'.
While here, in some cases turn off SSE functions more specifically based
on ARCH, and turn off -mtune=generic everywhere. These are part of a
larger work in progress; these commits are for ports that would have
been touched by the the powerpc-on-clang test regardless.
Approved by: portmgr (tier-2 blanket)
Modified:
head/audio/zam-plugins-lv2/Makefile
head/databases/redis-devel/Makefile
head/devel/py-cbor/Makefile
head/mail/isync/Makefile
head/net/parpd/Makefile
head/security/ossec-hids-local/Makefile
head/sysutils/fusefs-libs3/Makefile
head/sysutils/incron/Makefile
head/www/varnish6/Makefile
head/x11/xsettingsd/Makefile
Modified: head/audio/zam-plugins-lv2/Makefile
==============================================================================
--- head/audio/zam-plugins-lv2/Makefile Thu Jul 25 02:03:16 2019 (r507307)
+++ head/audio/zam-plugins-lv2/Makefile Thu Jul 25 02:33:12 2019 (r507308)
@@ -36,8 +36,10 @@ post-extract:
post-patch:
@${REINPLACE_CMD} -e 's|#!/bin/bash|#!/bin/sh|' ${WRKSRC}/dpf/utils/generate-ttl.sh
-.if ${ARCH} == aarch64 || ${ARCH:Marmv*} || ${ARCH:Mmips*} || ${ARCH:Mpowerpc*} || ${ARCH} == sparc64
- ${REINPLACE_CMD} -e 's/-mtune=generic -msse -msse2//' \
+ ${REINPLACE_CMD} -e 's/-mtune=generic//' \
+ ${WRKSRC}/dpf/Makefile.base.mk
+.if ! ${ARCH} == amd64 && ! ${ARCH} == i386
+ ${REINPLACE_CMD} -e 's/-msse -msse2//' \
${WRKSRC}/dpf/Makefile.base.mk
.endif
Modified: head/databases/redis-devel/Makefile
==============================================================================
--- head/databases/redis-devel/Makefile Thu Jul 25 02:03:16 2019 (r507307)
+++ head/databases/redis-devel/Makefile Thu Jul 25 02:33:12 2019 (r507308)
@@ -22,7 +22,7 @@ LUAJIT_DESC= Use lang/luajit instead of builtin lua
TESTS_DESC= Install lang/tcl for redis unit tests
TRIB_DESC= Install redis-trib.rb (lang/ruby req.)
-USES+= gmake
+USES+= compiler gmake
MAKE_ENV= "V=yo"
.include <bsd.port.options.mk>
@@ -90,6 +90,8 @@ PLIST_SUB+= REDIS_USER=${USERS} \
REDIS_DBDIR=${REDIS_DBDIR} \
REDIS_RUNDIR=${REDIS_RUNDIR}
+.include <bsd.port.pre.mk>
+
post-patch:
.if ${PORT_OPTIONS:MJEMALLOC}
@${REINPLACE_CMD} '35s!Linux!FreeBSD!g' ${WRKSRC}/src/Makefile
@@ -97,7 +99,7 @@ post-patch:
.if ${PORT_OPTIONS:MLUAJIT} || ${PORT_OPTIONS:MLUA}
@cd ${WRKSRC}/deps/lua/src && ${CP} fpconv.* lua_* strbuf.* ${WRKSRC}/src/
.endif
-.if ${ARCH:Mmips*} || ${ARCH:Mpowerpc*} || ${ARCH} == sparc64
+.if ${CHOSEN_COMPILER_TYPE} == gcc && ${COMPILER_VERSION} <= 42
${REINPLACE_CMD} -e '/pragma/d' ${WRKSRC}/src/lzf_d.c
.endif
Modified: head/devel/py-cbor/Makefile
==============================================================================
--- head/devel/py-cbor/Makefile Thu Jul 25 02:03:16 2019 (r507307)
+++ head/devel/py-cbor/Makefile Thu Jul 25 02:33:12 2019 (r507308)
@@ -12,13 +12,13 @@ COMMENT= RFC 7049 - Concise Binary Object Representati
LICENSE= APACHE20
-USES= python
+USES= compiler python
USE_PYTHON= autoplist concurrent distutils
.include <bsd.port.pre.mk>
+.if ${CHOSEN_COMPILER_TYPE} == gcc && ${COMPILER_VERSION} <= 42
post-patch:
-.if ${ARCH:Mmips*} || ${ARCH:Mpowerpc*} || ${ARCH} == sparc64
@${REINPLACE_CMD} -e '/pragma/d' ${WRKSRC}/c/cbormodule.c
.endif
Modified: head/mail/isync/Makefile
==============================================================================
--- head/mail/isync/Makefile Thu Jul 25 02:03:16 2019 (r507307)
+++ head/mail/isync/Makefile Thu Jul 25 02:33:12 2019 (r507308)
@@ -13,7 +13,7 @@ LICENSE= GPLv2
LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2
-USES= alias bdb cpe perl5 ssl
+USES= alias bdb compiler cpe perl5 ssl
USE_PERL5= build
GNU_CONFIGURE= yes
@@ -34,7 +34,7 @@ post-patch:
@${REINPLACE_CMD} -e 's|\$$(docdir)/examples|\$$(sysconfdir)|g' \
${WRKSRC}/src/Makefile.in ${WRKSRC}/src/compat/Makefile.in
@${REINPLACE_CMD} -e 's|-ansi||g' ${WRKSRC}/${CONFIGURE_SCRIPT}
-.if ${ARCH:Mmips*} || ${ARCH:Mpowerpc*} || ${ARCH} == sparc64
+.if ${CHOSEN_COMPILER_TYPE} == gcc && ${COMPILER_VERSION} <= 42
@${REINPLACE_CMD} -e '/pragma/d' ${WRKSRC}/src/util.c
.endif
Modified: head/net/parpd/Makefile
==============================================================================
--- head/net/parpd/Makefile Thu Jul 25 02:03:16 2019 (r507307)
+++ head/net/parpd/Makefile Thu Jul 25 02:33:12 2019 (r507308)
@@ -19,7 +19,7 @@ PLIST_FILES= sbin/parpd man/man8/parpd.8.gz
.include <bsd.port.pre.mk>
-.if ${ARCH:Mmips*} || ${ARCH:Mpowerpc*} || ${ARCH} == sparc64
+.if ${CHOSEN_COMPILER_TYPE} == gcc
pre-configure:
${REINPLACE_CMD} -e 's|-Wpedantic||' ${WRKSRC}/Makefile
.endif
Modified: head/security/ossec-hids-local/Makefile
==============================================================================
--- head/security/ossec-hids-local/Makefile Thu Jul 25 02:03:16 2019 (r507307)
+++ head/security/ossec-hids-local/Makefile Thu Jul 25 02:33:12 2019 (r507308)
@@ -12,7 +12,7 @@ COMMENT= Security tool to monitor and check logs and i
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/LICENSE
-USES= gmake ssl
+USES= compiler gmake ssl
OSSEC_TYPE?= local
@@ -201,7 +201,7 @@ post-patch:
@${REINPLACE_CMD} -e 's|-DLUA_USE_LINUX|& ${CPPFLAGS}|' \
-e 's|-lreadline|& ${LDFLAGS}|' \
${WRKSRC}/src/external/lua/src/Makefile
-.if ${ARCH:Mmips*} || ${ARCH:Mpowerpc*} || ${ARCH} == sparc64
+.if ${CHOSEN_COMPILER_TYPE} == gcc
@${REINPLACE_CMD} -e 's|-Wno-implicit-fallthrough||g' ${WRKSRC}/src/Makefile
.endif
Modified: head/sysutils/fusefs-libs3/Makefile
==============================================================================
--- head/sysutils/fusefs-libs3/Makefile Thu Jul 25 02:03:16 2019 (r507307)
+++ head/sysutils/fusefs-libs3/Makefile Thu Jul 25 02:33:12 2019 (r507308)
@@ -13,7 +13,7 @@ LICENSE= GPLv2 LGPL21
LICENSE_COMB= multi
LICENSE_FILE= ${WRKSRC}/LICENSE
-USES= meson
+USES= compiler meson
USE_LDCONFIG= yes
PLIST_SUB= VERSION=${PORTVERSION}
@@ -27,8 +27,8 @@ GH_PROJECT= libfuse
IGNORE= fusefs has not been implemented on DragonFly
.endif
+.if ${CHOSEN_COMPILER_TYPE} == gcc
post-patch:
-.if ${ARCH:Mmips*} || ${ARCH:Mpowerpc*} || ${ARCH} == sparc64
${REINPLACE_CMD} -e '/-Wno-unused-result/d' ${WRKSRC}/meson.build
.endif
Modified: head/sysutils/incron/Makefile
==============================================================================
--- head/sysutils/incron/Makefile Thu Jul 25 02:03:16 2019 (r507307)
+++ head/sysutils/incron/Makefile Thu Jul 25 02:33:12 2019 (r507308)
@@ -17,6 +17,7 @@ LICENSE_FILE_MIT= ${WRKSRC}/LICENSE-X11
LIB_DEPENDS= libinotify.so:devel/libinotify
+USES= compiler
USE_GITHUB= yes
GH_ACCOUNT= ar-
GH_TAGNAME= 81421d3a8bde0989d7e167d8a814d5232896c930
@@ -34,7 +35,7 @@ post-patch:
${WRKSRC}/*conf* ${WRKSRC}/Makefile ${WRKSRC}/*.[158h] \
${WRKSRC}/*.cpp
${REINPLACE_CMD} -e '/INITDIR/d' ${WRKSRC}/Makefile
-.if ${ARCH:Mmips*} || ${ARCH:Mpowerpc*} || ${ARCH} == sparc64
+.if ${CHOSEN_COMPILER_TYPE} == gcc && ${COMPILER_VERSION} <= 42
${REINPLACE_CMD} -e '/pragma/d' ${WRKSRC}/inotify-cxx.cpp \
${WRKSRC}/usertable.cpp
.endif
Modified: head/www/varnish6/Makefile
==============================================================================
--- head/www/varnish6/Makefile Thu Jul 25 02:03:16 2019 (r507307)
+++ head/www/varnish6/Makefile Thu Jul 25 02:33:12 2019 (r507308)
@@ -19,7 +19,7 @@ LIB_DEPENDS= libpcre.so:devel/pcre
CONFLICTS= varnish-2.* varnish-3.* varnish4-4.* varnish5-5.*
-USES= autoreconf cpe gmake libedit libtool ncurses pathfix \
+USES= autoreconf compiler cpe gmake libedit libtool ncurses pathfix \
pkgconfig python:3.4+,build readline shebangfix
SHEBANG_FILES= lib/libvcc/*.py
CPE_VENDOR= varnish-cache
@@ -52,7 +52,7 @@ post-patch:
.if defined(BAD_TESTS)
${RM} ${BAD_TESTS:C|.+|${WRKSRC}/bin/varnishtest/tests/\0.vtc|}
.endif
-.if ${ARCH:Mmips*} || ${ARCH:Mpowerpc*} || ${ARCH} == sparc64
+.if ${CHOSEN_COMPILER_TYPE} == gcc
${REINPLACE_CMD} -e '/-Wno-unknown-warning-option -Wno-implicit-fallthrough/d' ${WRKSRC}/configure.ac
.endif
Modified: head/x11/xsettingsd/Makefile
==============================================================================
--- head/x11/xsettingsd/Makefile Thu Jul 25 02:03:16 2019 (r507307)
+++ head/x11/xsettingsd/Makefile Thu Jul 25 02:33:12 2019 (r507308)
@@ -24,7 +24,7 @@ PLIST_FILES= bin/dump_xsettings \
.include <bsd.port.pre.mk>
-.if ${ARCH:Mmips*} || ${ARCH:Mpowerpc*} || ${ARCH} == sparc64
+.if ${CHOSEN_COMPILER_TYPE} == gcc
pre-configure:
${REINPLACE_CMD} -e 's|-Wno-narrowing||' ${WRKSRC}/SConstruct
.endif
More information about the svn-ports-head
mailing list