Date: Sat, 23 Mar 2024 14:58:03 GMT From: Po-Chuan Hsieh <sunpoet@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 7602c851f19d - main - databases/rocksdb: Fix build on aarch64 Message-ID: <202403231458.42NEw3P9084605@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=7602c851f19dcc7c9ac358baf3c7925acd937ce6 commit 7602c851f19dcc7c9ac358baf3c7925acd937ce6 Author: Po-Chuan Hsieh <sunpoet@FreeBSD.org> AuthorDate: 2024-03-23 14:18:09 +0000 Commit: Po-Chuan Hsieh <sunpoet@FreeBSD.org> CommitDate: 2024-03-23 14:30:39 +0000 databases/rocksdb: Fix build on aarch64 util/crc32c_arm64.cc:60:16: error: use of undeclared identifier 'AT_HWCAP' elf_aux_info(AT_HWCAP, &auxv, sizeof(auxv)); ^ util/crc32c_arm64.cc:89:16: error: use of undeclared identifier 'AT_HWCAP' elf_aux_info(AT_HWCAP, &auxv, sizeof(auxv)); ^ 2 errors generated. Reference: https://pkg-status.freebsd.org/ampere3/data/132arm64-default/1e21f425f6c4/logs/rocksdb-8.11.3.log Tested on: ref14-aarch64 --- databases/rocksdb/files/patch-aarch64 | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/databases/rocksdb/files/patch-aarch64 b/databases/rocksdb/files/patch-aarch64 index 31790f595624..d256ce95b119 100644 --- a/databases/rocksdb/files/patch-aarch64 +++ b/databases/rocksdb/files/patch-aarch64 @@ -1,14 +1,11 @@ ---- CMakeLists.txt.orig 2021-06-25 21:15:04 UTC -+++ CMakeLists.txt -@@ -612,6 +612,11 @@ if(HAVE_AUXV_GETAUXVAL) - add_definitions(-DROCKSDB_AUXV_GETAUXVAL_PRESENT) - endif() - -+check_cxx_symbol_exists(elf_aux_info sys/auxv.h HAVE_ELF_AUX_INFO) -+if(HAVE_ELF_AUX_INFO) -+ add_definitions(-DROCKSDB_AUXV_GETAUXVAL_PRESENT) -+endif() -+ - include_directories(${PROJECT_SOURCE_DIR}) - include_directories(${PROJECT_SOURCE_DIR}/include) - if(WITH_FOLLY_DISTRIBUTED_MUTEX) +--- util/crc32c_arm64.cc.orig 2024-02-28 00:24:11 UTC ++++ util/crc32c_arm64.cc +@@ -10,7 +10,7 @@ + #if defined(__linux__) + #include <asm/hwcap.h> + #endif +-#ifdef ROCKSDB_AUXV_GETAUXVAL_PRESENT ++#if defined(ROCKSDB_AUXV_GETAUXVAL_PRESENT) || defined(__FreeBSD__) + #include <sys/auxv.h> + #endif + #ifndef HWCAP_CRC32
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202403231458.42NEw3P9084605>