From owner-svn-ports-all@freebsd.org Wed Dec 2 00:52:51 2020 Return-Path: Delivered-To: svn-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 10A7646C58C; Wed, 2 Dec 2020 00:52:51 +0000 (UTC) (envelope-from pkubaj@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 "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Cm0nH01BDz3hqP; Wed, 2 Dec 2020 00:52:51 +0000 (UTC) (envelope-from pkubaj@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id E7B411EF0F; Wed, 2 Dec 2020 00:52:50 +0000 (UTC) (envelope-from pkubaj@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0B20qojE004645; Wed, 2 Dec 2020 00:52:50 GMT (envelope-from pkubaj@FreeBSD.org) Received: (from pkubaj@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0B20qoA3004642; Wed, 2 Dec 2020 00:52:50 GMT (envelope-from pkubaj@FreeBSD.org) Message-Id: <202012020052.0B20qoA3004642@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pkubaj set sender to pkubaj@FreeBSD.org using -f From: Piotr Kubaj Date: Wed, 2 Dec 2020 00:52:50 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r556800 - in head/databases/rocksdb: . files X-SVN-Group: ports-head X-SVN-Commit-Author: pkubaj X-SVN-Commit-Paths: in head/databases/rocksdb: . files X-SVN-Commit-Revision: 556800 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 Dec 2020 00:52:51 -0000 Author: pkubaj Date: Wed Dec 2 00:52:50 2020 New Revision: 556800 URL: https://svnweb.freebsd.org/changeset/ports/556800 Log: databases/rocksdb: fix build on powerpc64* Merge upstream commit that fixes build with LLVM on ppc64* (also affects other systems) and add patch which fixes build specifically on FreeBSD (PR currently waiting for acceptance). Added: head/databases/rocksdb/files/patch-util_crc32c.cc (contents, props changed) Modified: head/databases/rocksdb/Makefile head/databases/rocksdb/distinfo Modified: head/databases/rocksdb/Makefile ============================================================================== --- head/databases/rocksdb/Makefile Wed Dec 2 00:13:38 2020 (r556799) +++ head/databases/rocksdb/Makefile Wed Dec 2 00:52:50 2020 (r556800) @@ -6,6 +6,9 @@ PORTVERSION= 6.11.6 DISTVERSIONPREFIX= v CATEGORIES= databases +PATCH_SITES= https://github.com/facebook/${PORTNAME}/commit/ +PATCHFILES= b937be377901afa32357b60eebbee80f14087180.patch:-p1 + MAINTAINER?= sunpoet@FreeBSD.org COMMENT?= Persistent key-value store for fast storage environments @@ -17,7 +20,8 @@ LICENSE_FILE_GPLv2= ${WRKSRC}/COPYING BROKEN_DragonFly= does not build on DragonFly BSD using GCC with -Werror BROKEN_armv6?= does not build: db/c.cc:2281:44: implicit conversion loses integer precision: 'uint64_t' (aka 'unsigned long long') to 'size_t' (aka 'unsigned int') BROKEN_armv7?= does not build: /nxb-bin/usr/bin/ld: undefined reference to symbol `__gnu_Unwind_Find_exidx@@FBSD_1.4' (try adding -lc) #'` -BROKEN_powerpc64= does not build: util/crc32c.cc:435:22: 'arch_ppc_probe' was not declared in this scope +BROKEN_FreeBSD_11_powerpc64= does not build: util/crc32c.cc:435:22: 'arch_ppc_probe' was not declared in this scope +BROKEN_FreeBSD_12_powerpc64= does not build: util/crc32c.cc:435:22: 'arch_ppc_probe' was not declared in this scope BUILD_DEPENDS= bash:shells/bash LIB_DEPENDS= libgflags.so:devel/gflags \ Modified: head/databases/rocksdb/distinfo ============================================================================== --- head/databases/rocksdb/distinfo Wed Dec 2 00:13:38 2020 (r556799) +++ head/databases/rocksdb/distinfo Wed Dec 2 00:52:50 2020 (r556800) @@ -1,3 +1,5 @@ -TIMESTAMP = 1602780722 +TIMESTAMP = 1606857109 SHA256 (facebook-rocksdb-v6.11.6_GH0.tar.gz) = 7ff7cb277cad1dc4d1516c61470816e21c7c6e4dbb9a6e517dd590f2f2732b56 SIZE (facebook-rocksdb-v6.11.6_GH0.tar.gz) = 6210689 +SHA256 (b937be377901afa32357b60eebbee80f14087180.patch) = 05ec8d1d8710e954f43f528de012feb26ca3f1a46e77994b9591882ce2d64060 +SIZE (b937be377901afa32357b60eebbee80f14087180.patch) = 12681 Added: head/databases/rocksdb/files/patch-util_crc32c.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/rocksdb/files/patch-util_crc32c.cc Wed Dec 2 00:52:50 2020 (r556800) @@ -0,0 +1,24 @@ +--- util/crc32c.cc.orig 2020-12-01 23:49:39 UTC ++++ util/crc32c.cc +@@ -463,6 +463,21 @@ static int arch_ppc_probe(void) { + + return arch_ppc_crc32; + } ++#elif __FreeBSD__ ++#include ++#include ++#include ++static int arch_ppc_probe(void) { ++ unsigned long cpufeatures; ++ arch_ppc_crc32 = 0; ++ ++#if defined(__powerpc64__) ++ elf_aux_info(AT_HWCAP2, &cpufeatures, sizeof(cpufeatures)); ++ if (cpufeatures & PPC_FEATURE2_HAS_VEC_CRYPTO) arch_ppc_crc32 = 1; ++#endif /* __powerpc64__ */ ++ ++ return arch_ppc_crc32; ++} + #endif // __linux__ + + static bool isAltiVec() {