diff options
| author | Po-Chuan Hsieh <sunpoet@FreeBSD.org> | 2024-07-25 12:17:23 +0800 |
|---|---|---|
| committer | Po-Chuan Hsieh <sunpoet@FreeBSD.org> | 2024-07-25 12:17:23 +0800 |
| commit | 7e363120e8cf1c7acc5fd3c0b54a9684f70be591 (patch) | |
| tree | f0106a9b45c3ed4b5b5f4a1aaaf6ca5c3f5ac1dc /databases/tiledb/files/patch-magic | |
| parent | archivers/liblz4: Remove USES=shebangfix (diff) | |
databases/tiledb: Update to 2.25.0
Changes: https://github.com/TileDB-Inc/TileDB/releases
Diffstat (limited to 'databases/tiledb/files/patch-magic')
| -rw-r--r-- | databases/tiledb/files/patch-magic | 41 |
1 files changed, 0 insertions, 41 deletions
diff --git a/databases/tiledb/files/patch-magic b/databases/tiledb/files/patch-magic index b1a0812ff549..805e79d98495 100644 --- a/databases/tiledb/files/patch-magic +++ b/databases/tiledb/files/patch-magic @@ -122,44 +122,3 @@ Obtained from: https://github.com/TileDB-Inc/TileDB/pull/3270 if (libmagic_FOUND AND NOT TARGET libmagic) message(STATUS "Found Magic, adding imported target: ${libmagic_LIBRARIES}") ---- tiledb/CMakeLists.txt.orig 2022-08-25 01:25:52 UTC -+++ tiledb/CMakeLists.txt -@@ -357,14 +357,18 @@ target_link_libraries(TILEDB_CORE_OBJECTS PRIVATE $<BU - ############################################################ - # provide actions/target for preparation of magic.mgc data for embedding/build - --set(MGC_GZIPPED_BIN_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/..") -+set(MGC_GZIPPED_BIN_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/sm/misc") - set(MGC_GZIPPED_BIN_OUTPUT_FILE "${MGC_GZIPPED_BIN_OUTPUT_DIRECTORY}/magic_mgc_gzipped.bin") - set(MGC_GZIPPED_BIN_INPUT_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/sm/misc") - set(MGC_GZIPPED_BIN_INPUT_FILE "${MGC_GZIPPED_BIN_INPUT_DIRECTORY}/magic_mgc_gzipped.bin.tar.bz2") - -+# Create the output directory if it does not exist -+add_custom_target(create_magic_bin_output_directory ALL -+ COMMAND ${CMAKE_COMMAND} -E make_directory ${MGC_GZIPPED_BIN_OUTPUT_DIRECTORY}) -+ - add_custom_command( - OUTPUT "${MGC_GZIPPED_BIN_OUTPUT_FILE}" -- DEPENDS "${MGC_GZIPPED_BIN_INPUT_FILE}" -+ DEPENDS "${MGC_GZIPPED_BIN_INPUT_FILE}" create_magic_bin_output_directory - COMMAND ${CMAKE_COMMAND} -E tar x "${MGC_GZIPPED_BIN_INPUT_FILE}" - WORKING_DIRECTORY "${MGC_GZIPPED_BIN_OUTPUT_DIRECTORY}" - ) -@@ -380,7 +384,7 @@ add_custom_target( - WORKING_DIRECTORY "${MGC_GZIPPED_BIN_OUTPUT_DIRECTORY}" - COMMAND ${CMAKE_COMMAND} -E tar cvj "magic_mgc_gzipped.bin.tar.bz2" "magic_mgc_gzipped.bin" - COMMAND ${CMAKE_COMMAND} -E copy "magic_mgc_gzipped.bin.tar.bz2" "${MGC_GZIPPED_BIN_INPUT_FILE}" -- DEPENDS "${libmagic_DICTIONARY}" -+ DEPENDS "${libmagic_DICTIONARY}" create_magic_bin_output_directory - COMMENT "Re-generate ${MGC_GZIPPED_BIN_INPUT_FILE} for embedded magic.mgc support" - ) - -@@ -394,6 +398,8 @@ target_include_directories(TILEDB_CORE_OBJECTS - "${TILEDB_EXTERNALS_INCLUDE_DIRS}" - # to pickup <build_dir>/tiledb for capnp gen'd files - "${CMAKE_CURRENT_BINARY_DIR}/.." -+ # For libmagic binary data include -+ "${CMAKE_CURRENT_BINARY_DIR}/sm/misc" - ) - - # Build a separate copy of the object library for use with static TileDB |