git: f391042d9e30 - main - graphics/s2: improve experience for people on POWER newer than POWER7

From: Piotr Kubaj <pkubaj_at_FreeBSD.org>
Date: Thu, 21 Apr 2022 17:25:22 UTC
The branch main has been updated by pkubaj:

URL: https://cgit.FreeBSD.org/ports/commit/?id=f391042d9e30603094bcfdd216d2559fabfcd8db

commit f391042d9e30603094bcfdd216d2559fabfcd8db
Author:     Piotr Kubaj <pkubaj@FreeBSD.org>
AuthorDate: 2022-04-21 17:11:05 +0000
Commit:     Piotr Kubaj <pkubaj@FreeBSD.org>
CommitDate: 2022-04-21 17:11:05 +0000

    graphics/s2: improve experience for people on POWER newer than POWER7
    
    Don't hardcode -mcpu.
---
 graphics/s2/Makefile | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/graphics/s2/Makefile b/graphics/s2/Makefile
index 9cfd51ccf0bc..6f00c3c4821c 100644
--- a/graphics/s2/Makefile
+++ b/graphics/s2/Makefile
@@ -20,7 +20,6 @@ LIB_DEPENDS=	libgtest.so:devel/googletest
 USES=		cmake compiler:c++11-lang localbase ssl
 
 CMAKE_ON=	BUILD_SHARED_LIBS
-CXXFLAGS_powerpc64=	-mcpu=power7
 USE_LDCONFIG=	yes
 
 GH_ACCOUNT=	google
@@ -38,6 +37,12 @@ GFLAGS_LIB_DEPENDS=	libgflags.so:devel/gflags
 GLOG_CMAKE_BOOL=	WITH_GLOG
 GLOG_LIB_DEPENDS=	libglog.so:devel/glog
 
+.include <bsd.port.options.mk>
+
+.if ${ARCH} == powerpc64 && !defined(CPUTYPE)
+CXXFLAGS+=	-mcpu=power7
+.endif
+
 post-install-EXAMPLES-on:
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_PROGRAM} ${INSTALL_WRKSRC}/examples/point_index ${INSTALL_WRKSRC}/examples/term_index ${STAGEDIR}${EXAMPLESDIR}