git: ce4535bb529b - main - databases/rocksdb: Honor CPUTYPE and do not force '-march=native' on x86

Jung-uk Kim jkim at FreeBSD.org
Tue Jul 6 17:26:23 UTC 2021


The branch main has been updated by jkim:

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

commit ce4535bb529b78e7edfe89060a91e75c4af9d261
Author:     Jung-uk Kim <jkim at FreeBSD.org>
AuthorDate: 2021-07-06 17:24:31 +0000
Commit:     Jung-uk Kim <jkim at FreeBSD.org>
CommitDate: 2021-07-06 17:24:31 +0000

    databases/rocksdb: Honor CPUTYPE and do not force '-march=native' on x86
    
    PR:             256913
    Approved by:    sunpoet (maintainer)
---
 databases/rocksdb/Makefile | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/databases/rocksdb/Makefile b/databases/rocksdb/Makefile
index b34891a26eac..aaa3333e1160 100644
--- a/databases/rocksdb/Makefile
+++ b/databases/rocksdb/Makefile
@@ -3,6 +3,7 @@
 PORTNAME=	rocksdb
 PORTVERSION=	6.11.6
 DISTVERSIONPREFIX=	v
+PORTREVISION=	1
 CATEGORIES=	databases
 
 PATCH_SITES=	https://github.com/facebook/${PORTNAME}/commit/
@@ -81,13 +82,12 @@ CXXFLAGS+=	-Wno-error=shadow
 .endif
 
 post-patch:
-.if ${ARCH} != amd64 && ${ARCH} != i386
+.if (${ARCH} == amd64 || ${ARCH} == i386) && !empty(CFLAGS:M-march=*)
+	@${REINPLACE_CMD} -e 's| -march=native| ${CFLAGS:M-march=*}|' \
+	    ${WRKSRC}/build_tools/build_detect_platform
+.else
 	@${REINPLACE_CMD} -e 's| -march=native||' ${WRKSRC}/build_tools/build_detect_platform
 .endif
-# Disable SSE4.2 on i386 architecture to fix i386 builds on FreeBSD package building cluster
-.if ${ARCH} == i386
-	@${REINPLACE_CMD} -e 's|#ifdef __SSE4_2__|&DISABLED__|' ${WRKSRC}/util/crc32c.cc
-.endif
 
 post-install:
 	${MKDIR} ${STAGEDIR}${DATADIR}/


More information about the dev-commits-ports-main mailing list