diff options
| author | Po-Chuan Hsieh <sunpoet@FreeBSD.org> | 2021-10-25 21:45:46 +0000 |
|---|---|---|
| committer | Po-Chuan Hsieh <sunpoet@FreeBSD.org> | 2021-10-25 21:54:46 +0000 |
| commit | e66b400269c02390b9ccce1ea80c69073c044758 (patch) | |
| tree | f1950974fc7259e9ba19d462e2f5a77ff4bb70a8 | |
| parent | 5494e47756d5654674054f0718ea39a00714a94b (diff) | |
| download | ports-e66b400269c02390b9ccce1ea80c69073c044758.tar.gz ports-e66b400269c02390b9ccce1ea80c69073c044758.zip | |
databases/rocksdb-lite: Unbreak this port
Approved by: portmgr (blanket)
| -rw-r--r-- | databases/rocksdb-lite/Makefile | 5 | ||||
| -rw-r--r-- | databases/rocksdb/Makefile | 4 | ||||
| -rw-r--r-- | 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 <bsd.port.pre.mk> 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 |