From nobody Mon Oct 25 22:06:02 2021 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 9C351181A763; Mon, 25 Oct 2021 22:06:09 +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 4HdTYW6R8Vz4TbK; Mon, 25 Oct 2021 22:06:07 +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 17372110D6; Mon, 25 Oct 2021 22:06:03 +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 19PM62VG078149; Mon, 25 Oct 2021 22:06:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 19PM62p3078148; Mon, 25 Oct 2021 22:06:02 GMT (envelope-from git) Date: Mon, 25 Oct 2021 22:06:02 GMT Message-Id: <202110252206.19PM62p3078148@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Po-Chuan Hsieh Subject: git: e66b400269c0 - main - databases/rocksdb-lite: Unbreak this port List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sunpoet X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e66b400269c02390b9ccce1ea80c69073c044758 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=e66b400269c02390b9ccce1ea80c69073c044758 commit e66b400269c02390b9ccce1ea80c69073c044758 Author: Po-Chuan Hsieh AuthorDate: 2021-10-25 21:45:46 +0000 Commit: Po-Chuan Hsieh CommitDate: 2021-10-25 21:54:46 +0000 databases/rocksdb-lite: Unbreak this port Approved by: portmgr (blanket) --- databases/rocksdb-lite/Makefile | 5 ++--- databases/rocksdb/Makefile | 4 ++-- databases/rocksdb/pkg-plist | 12 ++++++------ 3 files changed, 10 insertions(+), 11 deletions(-) diff --git a/databases/rocksdb-lite/Makefile b/databases/rocksdb-lite/Makefile index 76f6cfd68a1e..ce2592e8c5be 100644 --- a/databases/rocksdb-lite/Makefile +++ b/databases/rocksdb-lite/Makefile @@ -8,8 +8,7 @@ COMMENT= Persistent key-value store for fast storage environments (lite version) LITE= yes MASTERDIR= ${.CURDIR}/../rocksdb -BROKEN= fails to package -BROKEN_armv6= does not build: db/compaction_job.cc:714:52: error: implicit conversion loses integer precision: 'uint64_t' (aka 'unsigned long long') to 'const size_t' (aka 'const unsigned int') -BROKEN_armv7= does not build: db/compaction_job.cc:714:52: error: implicit conversion loses integer precision: 'uint64_t' (aka 'unsigned long long') to 'const size_t' (aka 'const unsigned int') +BROKEN_armv6= does not build: db/compaction_job.cc:714:52: error: implicit conversion loses integer precision: 'uint64_t' (aka 'unsigned long long') to 'const size_t' (aka 'const unsigned int') +BROKEN_armv7= does not build: db/compaction_job.cc:714:52: error: implicit conversion loses integer precision: 'uint64_t' (aka 'unsigned long long') to 'const size_t' (aka 'const unsigned int') .include "${MASTERDIR}/Makefile" diff --git a/databases/rocksdb/Makefile b/databases/rocksdb/Makefile index f01557eff863..f7e5d924a92d 100644 --- a/databases/rocksdb/Makefile +++ b/databases/rocksdb/Makefile @@ -58,13 +58,13 @@ ZSTD_MAKE_ENV_OFF= ROCKSDB_DISABLE_ZSTD=yes .if !defined(LITE) CONFLICTS_INSTALL= rocksdb-lite -PLIST_SUB+= LITE="@comment " +PLIST_SUB+= LITE="@comment " NO_LITE="" .else PKGNAMESUFFIX= -lite CONFLICTS_INSTALL= rocksdb CFLAGS+= -DROCKSDB_LITE=1 MAKE_ENV+= LIBNAME=librocksdb${PKGNAMESUFFIX} DISABLE_JEMALLOC=1 -PLIST_SUB+= LITE="" +PLIST_SUB+= LITE="" NO_LITE="@comment " .endif .include diff --git a/databases/rocksdb/pkg-plist b/databases/rocksdb/pkg-plist index 6492d406ead8..d0cf3d25627a 100644 --- a/databases/rocksdb/pkg-plist +++ b/databases/rocksdb/pkg-plist @@ -115,10 +115,10 @@ include/rocksdb/write_buffer_manager.h %%LITE%%lib/librocksdb-lite.so.%%SHLIB_VER%% %%LITE%%lib/librocksdb-lite.so.%%PORTVERSION%% %%LITE%%lib/librocksdb-lite_tools.so -lib/librocksdb.a -lib/librocksdb.so -lib/librocksdb.so.6 -lib/librocksdb.so.%%SHLIB_VER%% -lib/librocksdb.so.%%PORTVERSION%% -lib/librocksdb_tools.so +%%NO_LITE%%lib/librocksdb.a +%%NO_LITE%%lib/librocksdb.so +%%NO_LITE%%lib/librocksdb.so.6 +%%NO_LITE%%lib/librocksdb.so.%%SHLIB_VER%% +%%NO_LITE%%lib/librocksdb.so.%%PORTVERSION%% +%%NO_LITE%%lib/librocksdb_tools.so libdata/pkgconfig/rocksdb.pc