From: Mathieu Baudier <redacted>
Date: Mon, 23 Jun 2025 11:55:42 +0000 (+0200)
Subject: Simplify CMake patch
X-Git-Url: https://git.djapps.eu/?a=commitdiff_plain;h=0c11d3395c26118216fcb80e2f5df320296d55bb;p=pkg%2Fggml%2Fsources%2Fllama.cpp

Simplify CMake patch
---

diff --git a/debian/patches/0001-improve-cmake-build.patch b/debian/patches/0001-improve-cmake-build.patch
index 5f6cc294..a2a78d9b 100644
--- a/debian/patches/0001-improve-cmake-build.patch
+++ b/debian/patches/0001-improve-cmake-build.patch
@@ -3,39 +3,33 @@ Date: Sun, 23 Feb 2025 11:31:46 +0100
 Subject: improve-cmake-build
 
 ---
- cmake/build-info.cmake | 4 ++++
- src/CMakeLists.txt     | 4 ++++
- 2 files changed, 8 insertions(+)
+ CMakeLists.txt     | 2 +-
+ src/CMakeLists.txt | 4 ++++
+ 2 files changed, 5 insertions(+), 1 deletion(-)
 
-diff --git a/cmake/build-info.cmake b/cmake/build-info.cmake
-index 75c7822..c9b544b 100644
---- a/cmake/build-info.cmake
-+++ b/cmake/build-info.cmake
-@@ -1,3 +1,5 @@
-+if(NOT DEFINED BUILD_NUMBER) # Debian patch
-+
- set(BUILD_NUMBER 0)
- set(BUILD_COMMIT "unknown")
- set(BUILD_COMPILER "unknown")
-@@ -39,6 +41,8 @@ if(Git_FOUND)
-     endif()
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 50801cd..d2becb0 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -95,7 +95,7 @@ endif()
+ if (NOT DEFINED LLAMA_BUILD_COMMIT)
+     set(LLAMA_BUILD_COMMIT        ${BUILD_COMMIT})
  endif()
+-set(LLAMA_INSTALL_VERSION 0.0.${BUILD_NUMBER})
++set(LLAMA_INSTALL_VERSION 0.0.${LLAMA_BUILD_NUMBER})
  
-+endif() # END Debian patch
-+
- if(MSVC)
-     set(BUILD_COMPILER "${CMAKE_C_COMPILER_ID} ${CMAKE_C_COMPILER_VERSION}")
-     if (CMAKE_VS_PLATFORM_NAME)
+ # override ggml options
+ set(GGML_ALL_WARNINGS   ${LLAMA_ALL_WARNINGS})
 diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 1cd316b..7b785c5 100644
+index 8f9cd65..9aa905a 100644
 --- a/src/CMakeLists.txt
 +++ b/src/CMakeLists.txt
-@@ -42,4 +42,8 @@ if (BUILD_SHARED_LIBS)
+@@ -47,4 +47,8 @@ if (BUILD_SHARED_LIBS)
      set_target_properties(llama PROPERTIES POSITION_INDEPENDENT_CODE ON)
      target_compile_definitions(llama PRIVATE LLAMA_BUILD)
      target_compile_definitions(llama PUBLIC  LLAMA_SHARED)
-+	if(DEFINED BUILD_NUMBER)
-+        message(STATUS "Set llama shared library version to 0.0.${BUILD_NUMBER}")
-+    	set_target_properties(llama PROPERTIES VERSION 0.0.${BUILD_NUMBER} SOVERSION 0)
++	if(DEFINED LLAMA_INSTALL_VERSION)
++        message(STATUS "Set llama shared library version to ${LLAMA_INSTALL_VERSION}")
++    	set_target_properties(llama PROPERTIES VERSION ${LLAMA_INSTALL_VERSION} SOVERSION 0)
 +    endif()
  endif()