From owner-dev-commits-ports-all@freebsd.org Tue Jul 6 17:26:22 2021 Return-Path: Delivered-To: dev-commits-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id E905F6648B2; Tue, 6 Jul 2021 17:26:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4GK8by61PPz4WLX; Tue, 6 Jul 2021 17:26:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id B769D1D747; Tue, 6 Jul 2021 17:26:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 166HQMUK012919; Tue, 6 Jul 2021 17:26:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 166HQMqX012918; Tue, 6 Jul 2021 17:26:22 GMT (envelope-from git) Date: Tue, 6 Jul 2021 17:26:22 GMT Message-Id: <202107061726.166HQMqX012918@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jung-uk Kim Subject: git: ce4535bb529b - main - databases/rocksdb: Honor CPUTYPE and do not force '-march=native' on x86 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jkim X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ce4535bb529b78e7edfe89060a91e75c4af9d261 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 06 Jul 2021 17:26:23 -0000 The branch main has been updated by jkim: URL: https://cgit.FreeBSD.org/ports/commit/?id=ce4535bb529b78e7edfe89060a91e75c4af9d261 commit ce4535bb529b78e7edfe89060a91e75c4af9d261 Author: Jung-uk Kim AuthorDate: 2021-07-06 17:24:31 +0000 Commit: Jung-uk Kim 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}/