From e265b3d691f3136e0931fd951bb1dd62121212db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Camila=20Duitama=20Gonz=C3=A1lez?= Date: Tue, 21 Jan 2025 04:42:56 +0100 Subject: [PATCH] add one path per external project --- recipes/muset/external_project_fmt.patch | 14 ++++ recipes/muset/external_project_kff.patch | 16 +++++ recipes/muset/external_project_lz4.patch | 16 +++++ recipes/muset/external_project_spdlog.patch | 15 ++++ recipes/muset/external_project_xxhash.patch | 16 +++++ recipes/muset/external_projects.patch | 79 --------------------- recipes/muset/meta.yaml | 8 ++- 7 files changed, 83 insertions(+), 81 deletions(-) create mode 100644 recipes/muset/external_project_fmt.patch create mode 100644 recipes/muset/external_project_kff.patch create mode 100644 recipes/muset/external_project_lz4.patch create mode 100644 recipes/muset/external_project_spdlog.patch create mode 100644 recipes/muset/external_project_xxhash.patch delete mode 100644 recipes/muset/external_projects.patch diff --git a/recipes/muset/external_project_fmt.patch b/recipes/muset/external_project_fmt.patch new file mode 100644 index 0000000000000..9670482ffe15c --- /dev/null +++ b/recipes/muset/external_project_fmt.patch @@ -0,0 +1,14 @@ +--- a/cmake/fmt.cmake ++++ b/cmake/fmt.cmake +@@ -2,10 +2,11 @@ + + ExternalProject_Add(FMT + PREFIX ${external_bindir}/FMT + SOURCE_DIR ${external_dir}/fmt + DOWNLOAD_COMMAND "" + CMAKE_ARGS -DCMAKE_BUILD_TYPE=Release -DCMAKE_VERBOSE_MAKEFILE=ON + -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER} -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER} + INSTALL_COMMAND ${CMAKE_COMMAND} -E echo "Using existing fmt library" + LOG_CONFIGURE ON + LOG_BUILD ON + ) \ No newline at end of file diff --git a/recipes/muset/external_project_kff.patch b/recipes/muset/external_project_kff.patch new file mode 100644 index 0000000000000..b5777eb3a0f66 --- /dev/null +++ b/recipes/muset/external_project_kff.patch @@ -0,0 +1,16 @@ +--- a/cmake/lz4.cmake ++++ b/cmake/lz4.cmake +@@ -2,13 +2,14 @@ + + ExternalProject_Add(LZ4 + PREFIX ${external_bindir}/LZ4 + SOURCE_SUBDIR build/cmake + SOURCE_DIR ${external_dir}/lz4 + DOWNLOAD_COMMAND "" + CMAKE_ARGS -DBUILD_STATIC_LIBS=ON -DBUILD_SHARED_LIBS=OFF + -DCMAKE_BUILD_TYPE=Release -DCMAKE_VERBOSE_MAKEFILE=ON + -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER} -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER} + INSTALL_COMMAND ${CMAKE_COMMAND} -E echo "Using existing lz4 library" + LOG_CONFIGURE ON + LOG_BUILD ON + ) \ No newline at end of file diff --git a/recipes/muset/external_project_lz4.patch b/recipes/muset/external_project_lz4.patch new file mode 100644 index 0000000000000..b5777eb3a0f66 --- /dev/null +++ b/recipes/muset/external_project_lz4.patch @@ -0,0 +1,16 @@ +--- a/cmake/lz4.cmake ++++ b/cmake/lz4.cmake +@@ -2,13 +2,14 @@ + + ExternalProject_Add(LZ4 + PREFIX ${external_bindir}/LZ4 + SOURCE_SUBDIR build/cmake + SOURCE_DIR ${external_dir}/lz4 + DOWNLOAD_COMMAND "" + CMAKE_ARGS -DBUILD_STATIC_LIBS=ON -DBUILD_SHARED_LIBS=OFF + -DCMAKE_BUILD_TYPE=Release -DCMAKE_VERBOSE_MAKEFILE=ON + -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER} -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER} + INSTALL_COMMAND ${CMAKE_COMMAND} -E echo "Using existing lz4 library" + LOG_CONFIGURE ON + LOG_BUILD ON + ) \ No newline at end of file diff --git a/recipes/muset/external_project_spdlog.patch b/recipes/muset/external_project_spdlog.patch new file mode 100644 index 0000000000000..7786962937601 --- /dev/null +++ b/recipes/muset/external_project_spdlog.patch @@ -0,0 +1,15 @@ +--- a/cmake/spdlog.cmake ++++ b/cmake/spdlog.cmake +@@ -2,11 +2,12 @@ + + ExternalProject_Add(SPDLOG + PREFIX ${external_bindir}/SPDLOG + SOURCE_DIR ${external_dir}/spdlog + DOWNLOAD_COMMAND "" + CMAKE_ARGS -DCMAKE_BUILD_TYPE=Release -DCMAKE_VERBOSE_MAKEFILE=ON + -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER} -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER} + -DSPDLOG_BUILD_SHARED=OFF + INSTALL_COMMAND ${CMAKE_COMMAND} -E echo "Using existing spdlog library" + LOG_CONFIGURE ON + LOG_BUILD ON + ) \ No newline at end of file diff --git a/recipes/muset/external_project_xxhash.patch b/recipes/muset/external_project_xxhash.patch new file mode 100644 index 0000000000000..fa1f1b4a01c69 --- /dev/null +++ b/recipes/muset/external_project_xxhash.patch @@ -0,0 +1,16 @@ +--- a/cmake/xxHash.cmake ++++ b/cmake/xxHash.cmake +@@ -2,12 +2,13 @@ + + ExternalProject_Add(XXHASH + PREFIX ${external_bindir}/XXHASH + SOURCE_SUBDIR "cmake_unofficial" + SOURCE_DIR ${external_dir}/xxHash + DOWNLOAD_COMMAND "" + CMAKE_ARGS -DCMAKE_BUILD_TYPE=Release -DCMAKE_VERBOSE_MAKEFILE=ON + -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER} -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER} + -DBUILD_SHARED_LIBS=OFF + INSTALL_COMMAND ${CMAKE_COMMAND} -E echo "Using existing xxHash library" + LOG_CONFIGURE ON + LOG_Build ON + ) \ No newline at end of file diff --git a/recipes/muset/external_projects.patch b/recipes/muset/external_projects.patch deleted file mode 100644 index a3f10f18d2a54..0000000000000 --- a/recipes/muset/external_projects.patch +++ /dev/null @@ -1,79 +0,0 @@ ---- a/cmake/fmt.cmake -+++ b/cmake/fmt.cmake -@@ -2,10 +2,11 @@ - - ExternalProject_Add(FMT - PREFIX ${external_bindir}/FMT - SOURCE_DIR ${external_dir}/fmt - DOWNLOAD_COMMAND "" - CMAKE_ARGS -DCMAKE_BUILD_TYPE=Release -DCMAKE_VERBOSE_MAKEFILE=ON - -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER} -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER} - INSTALL_COMMAND ${CMAKE_COMMAND} -E echo "Using existing fmt library" - LOG_CONFIGURE ON - LOG_BUILD ON - ) - -+--- a/cmake/kff-cpp-api.cmake -+++ b/cmake/kff-cpp-api.cmake -@@ -2,10 +2,11 @@ - - ExternalProject_Add(KFF - PREFIX ${external_bindir}/KFF - SOURCE_DIR ${external_dir}/kff-cpp-api - DOWNLOAD_COMMAND "" - CMAKE_ARGS -DCMAKE_BUILD_TYPE=Release -DCMAKE_VERBOSE_MAKEFILE=ON - -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER} -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER} - INSTALL_COMMAND ${CMAKE_COMMAND} -E echo "Using existing kff-cpp-api library" - LOG_CONFIGURE ON - LOG_BUILD ON - ) - -+--- a/cmake/lz4.cmake -+++ b/cmake/lz4.cmake -@@ -2,13 +2,14 @@ - - ExternalProject_Add(LZ4 - PREFIX ${external_bindir}/LZ4 - SOURCE_SUBDIR build/cmake - SOURCE_DIR ${external_dir}/lz4 - DOWNLOAD_COMMAND "" - CMAKE_ARGS -DBUILD_STATIC_LIBS=ON -DBUILD_SHARED_LIBS=OFF - -DCMAKE_BUILD_TYPE=Release -DCMAKE_VERBOSE_MAKEFILE=ON - -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER} -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER} - INSTALL_COMMAND ${CMAKE_COMMAND} -E echo "Using existing lz4 library" - LOG_CONFIGURE ON - LOG_BUILD ON - ) - -+--- a/cmake/spdlog.cmake -+++ b/cmake/spdlog.cmake -@@ -2,11 +2,12 @@ - - ExternalProject_Add(SPDLOG - PREFIX ${external_bindir}/SPDLOG - SOURCE_DIR ${external_dir}/spdlog - DOWNLOAD_COMMAND "" - CMAKE_ARGS -DCMAKE_BUILD_TYPE=Release -DCMAKE_VERBOSE_MAKEFILE=ON - -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER} -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER} - -DSPDLOG_BUILD_SHARED=OFF - INSTALL_COMMAND ${CMAKE_COMMAND} -E echo "Using existing spdlog library" - LOG_CONFIGURE ON - LOG_BUILD ON - ) - -+--- a/cmake/xxHash.cmake -+++ b/cmake/xxHash.cmake -@@ -2,12 +2,13 @@ - - ExternalProject_Add(XXHASH - PREFIX ${external_bindir}/XXHASH - SOURCE_SUBDIR "cmake_unofficial" - SOURCE_DIR ${external_dir}/xxHash - DOWNLOAD_COMMAND "" - CMAKE_ARGS -DCMAKE_BUILD_TYPE=Release -DCMAKE_VERBOSE_MAKEFILE=ON - -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER} -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER} - -DBUILD_SHARED_LIBS=OFF - INSTALL_COMMAND ${CMAKE_COMMAND} -E echo "Using existing xxHash library" - LOG_CONFIGURE ON - LOG_BUILD ON - ) \ No newline at end of file diff --git a/recipes/muset/meta.yaml b/recipes/muset/meta.yaml index f8eea8342c701..922bd0d779495 100644 --- a/recipes/muset/meta.yaml +++ b/recipes/muset/meta.yaml @@ -8,8 +8,12 @@ source: url: https://github.com/CamilaDuitama/muset/archive/v{{ version }}.tar.gz sha256: 0f924e44e2af25397147e40934e024180a8b65c715750f2e9aacdb72fedeb600 recursive: True - patches: - - external_projects.patch + patches: + - external_project_fmt.patch + - external_project_kff.patch + - external_project_lz4.patch + - external_project_spdlog.patch + - external_project_xxhash.patch build: number: 0 # Reset build number to 0