Index: head/databases/rocksdb/Makefile =================================================================== --- head/databases/rocksdb/Makefile (revision 556799) +++ head/databases/rocksdb/Makefile (revision 556800) @@ -1,96 +1,100 @@ # Created by: Sunpoet Po-Chuan Hsieh # $FreeBSD$ PORTNAME= rocksdb 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 LICENSE= APACHE20 GPLv2 LICENSE_COMB= dual LICENSE_FILE_APACHE20= ${WRKSRC}/LICENSE.Apache 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 \ libsnappy.so:archivers/snappy OPTIONS_DEFINE= DEBUG LZ4 ZSTD OPTIONS_DEFAULT=LZ4 USES= compiler:c++11-lib gmake localbase:ldflags perl5 USE_PERL5= build ALL_TARGET= shared_lib static_lib all CFLAGS+= -DOS_FREEBSD CONFIGURE_ARGS= make_config.mk CONFIGURE_ENV= PORTABLE=0 ROCKSDB_ROOT=${WRKSRC} CONFIGURE_SCRIPT= build_tools/build_detect_platform HAS_CONFIGURE= yes MAKE_ENV= CXX=${CXX} INSTALL_PATH=${STAGEDIR}${PREFIX} USE_RTTI=1 USE_CXXSTD= c++11 USE_LDCONFIG= yes TEST_TARGET= check PLIST_SUB= PORTVERSION=${PORTVERSION} SHLIB_VER=${PORTVERSION:R} PORTDATA= make_config.mk GH_ACCOUNT= facebook USE_GITHUB= yes BENCHMARKS= cache_bench db_bench memtablerep_bench persistent_cache_bench range_del_aggregator_bench table_reader_bench TOOLS= blob_dump db_repl_stress db_sanity_test db_stress ldb rocksdb_dump rocksdb_undump sst_dump trace_analyzer write_stress DEBUG_MAKE_ENV= DEBUG_LEVEL=2 DEBUG_MAKE_ENV_OFF= DEBUG_LEVEL=0 LZ4_LIB_DEPENDS= liblz4.so:archivers/liblz4 LZ4_MAKE_ENV_OFF= ROCKSDB_DISABLE_LZ4=yes ZSTD_LIB_DEPENDS= libzstd.so:archivers/zstd ZSTD_MAKE_ENV_OFF= ROCKSDB_DISABLE_ZSTD=yes .if !defined(LITE) CONFLICTS_INSTALL= rocksdb-lite PLIST_SUB+= LITE="@comment " .else PKGNAMESUFFIX= -lite CONFLICTS_INSTALL= rocksdb CFLAGS+= -DROCKSDB_LITE=1 MAKE_ENV+= LIBNAME=librocksdb${PKGNAMESUFFIX} DISABLE_JEMALLOC=1 PLIST_SUB+= LITE="" .endif .include .if ${CHOSEN_COMPILER_TYPE} == clang CXXFLAGS+= -Wno-inconsistent-missing-override -Wno-unused-variable # Clang 8 detects shadow enums and stops the build. This workaround adds -Wno-error=shadow to bypass it. .if ${COMPILER_VERSION} >= 80 CXXFLAGS+= -Wno-error=shadow .endif .endif post-patch: .if ${ARCH} != amd64 && ${ARCH} != i386 @${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}/ cd ${WRKSRC}/ && ${INSTALL_PROGRAM} ${BENCHMARKS} ${TOOLS} ${STAGEDIR}${PREFIX}/bin/ ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/librocksdb${PKGNAMESUFFIX}.so ${INSTALL_DATA} ${WRKSRC}/librocksdb${PKGNAMESUFFIX}_tools.a ${STAGEDIR}${PREFIX}/lib/ ${INSTALL_DATA} ${WRKSRC}/make_config.mk ${STAGEDIR}${DATADIR}/ .include Index: head/databases/rocksdb/distinfo =================================================================== --- head/databases/rocksdb/distinfo (revision 556799) +++ head/databases/rocksdb/distinfo (revision 556800) @@ -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 Index: head/databases/rocksdb/files/patch-util_crc32c.cc =================================================================== --- head/databases/rocksdb/files/patch-util_crc32c.cc (nonexistent) +++ head/databases/rocksdb/files/patch-util_crc32c.cc (revision 556800) @@ -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() { Property changes on: head/databases/rocksdb/files/patch-util_crc32c.cc ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property