public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/llama-cpp] rawhide: Update to b10630
@ 2026-09-01 14:28 Tom Rix
  0 siblings, 0 replies; only message in thread
From: Tom Rix @ 2026-09-01 14:28 UTC (permalink / raw)
  To: git-commits

            A new commit has been pushed.

            Repo   : rpms/llama-cpp
            Branch : rawhide
            Commit : 9d543863c447e610d10f581e241432f96e4999fc
            Author : Tom Rix <Tom.Rix@amd.com>
            Date   : 2026-09-01T07:27:53-07:00
            Stats  : +17/-30 in 3 file(s)
            URL    : https://src.fedoraproject.org/rpms/llama-cpp/c/9d543863c447e610d10f581e241432f96e4999fc?branch=rawhide

            Log:
            Update to b10630

Signed-off-by: Tom Rix <Tom.Rix@amd.com>

---
diff --git a/.gitignore b/.gitignore
index 257dd56..97533a4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,4 @@
 /llama.cpp-b9781.tar.gz
 /llama.cpp-b9840.tar.gz
 /llama.cpp-b10353.tar.gz
+/llama.cpp-b10630.tar.gz

diff --git a/llama-cpp.spec b/llama-cpp.spec
index fbf7d56..a894770 100644
--- a/llama-cpp.spec
+++ b/llama-cpp.spec
@@ -37,7 +37,7 @@ Name:           llama-cpp
 # This is the main license
 
 License:        MIT AND Apache-2.0 AND LicenseRef-Fedora-Public-Domain
-Version:        b10353
+Version:        b10630
 Release:        %autorelease
 
 URL:            https://github.com/ggerganov/llama.cpp
@@ -195,15 +195,15 @@ rm -rf exmples/llma.android
 # git cruft
 find . -name '.gitignore' -exec rm -rf {} \;
 
-# Some so version help
-sed -i -e 's@WINDOWS_EXPORT_ALL_SYMBOLS ON@WINDOWS_EXPORT_ALL_SYMBOLS ON VERSION ${LLAMA_INSTALL_VERSION} SOVERSION 0@' tools/batched-bench/CMakeLists.txt
-sed -i -e 's@WINDOWS_EXPORT_ALL_SYMBOLS ON@WINDOWS_EXPORT_ALL_SYMBOLS ON VERSION ${LLAMA_INSTALL_VERSION} SOVERSION 0@' tools/llama-bench/CMakeLists.txt
-sed -i -e 's@WINDOWS_EXPORT_ALL_SYMBOLS ON@WINDOWS_EXPORT_ALL_SYMBOLS ON VERSION ${LLAMA_INSTALL_VERSION} SOVERSION 0@' tools/cli/CMakeLists.txt
-sed -i -e 's@WINDOWS_EXPORT_ALL_SYMBOLS ON@WINDOWS_EXPORT_ALL_SYMBOLS ON VERSION ${LLAMA_INSTALL_VERSION} SOVERSION 0@' tools/completion/CMakeLists.txt
-sed -i -e 's@WINDOWS_EXPORT_ALL_SYMBOLS ON@WINDOWS_EXPORT_ALL_SYMBOLS ON VERSION ${LLAMA_INSTALL_VERSION} SOVERSION 0@' tools/fit-params/CMakeLists.txt
-sed -i -e 's@WINDOWS_EXPORT_ALL_SYMBOLS ON@WINDOWS_EXPORT_ALL_SYMBOLS ON VERSION ${LLAMA_INSTALL_VERSION} SOVERSION 0@' tools/perplexity/CMakeLists.txt
-sed -i -e 's@WINDOWS_EXPORT_ALL_SYMBOLS ON@WINDOWS_EXPORT_ALL_SYMBOLS ON VERSION ${LLAMA_INSTALL_VERSION} SOVERSION 0@' tools/quantize/CMakeLists.txt
-sed -i -e 's@WINDOWS_EXPORT_ALL_SYMBOLS ON@WINDOWS_EXPORT_ALL_SYMBOLS ON VERSION ${LLAMA_INSTALL_VERSION} SOVERSION 0@' tools/server/CMakeLists.txt
+# Some lib*-impl's do not have so versions, so make them static
+sed -i -e 's@add_library(${TARGET} @add_library(${TARGET} STATIC @' tools/batched-bench/CMakeLists.txt
+sed -i -e 's@add_library(${TARGET} @add_library(${TARGET} STATIC @' tools/llama-bench/CMakeLists.txt
+sed -i -e 's@add_library(${TARGET} @add_library(${TARGET} STATIC @' tools/cli/CMakeLists.txt
+sed -i -e 's@add_library(${TARGET} @add_library(${TARGET} STATIC @' tools/completion/CMakeLists.txt
+sed -i -e 's@add_library(${TARGET} @add_library(${TARGET} STATIC @' tools/fit-params/CMakeLists.txt
+sed -i -e 's@add_library(${TARGET} @add_library(${TARGET} STATIC @' tools/perplexity/CMakeLists.txt
+sed -i -e 's@add_library(${TARGET} @add_library(${TARGET} STATIC @' tools/quantize/CMakeLists.txt
+sed -i -e 's@add_library(${TARGET}@add_library(${TARGET} STATIC @' tools/server/CMakeLists.txt
 
 %build
 
@@ -229,8 +229,9 @@ export HIPCC_COMPILE_FLAGS_APPEND="--offload-compress"
     -DGGML_F16C=OFF \
     -DGGML_HIP=%{build_hip} \
     -DGGML_VULKAN=%{build_vulkan} \
-    -DAMDGPU_TARGETS=%{rocm_gpu_list} \
+    -DGPU_TARGETS=%{rocm_gpu_list} \
     -DLLAMA_BUILD_EXAMPLES=%{build_examples} \
+    -DLLAMA_BUILD_IS_DEV=OFF \
     -DLLAMA_BUILD_TESTS=%{build_test}
 
 %cmake_build
@@ -254,6 +255,9 @@ cp -r %{_vpath_srcdir}/README.md %{buildroot}%{_datarootdir}/%{name}/
 rm -rf %{buildroot}%{_datarootdir}/%{name}/examples/llama.android
 %endif
 
+# Static libraries are used in build, do not package them
+rm -rf %{buildroot}%{_libdir}/lib*.a
+
 %if %{with test}
 %if %{with check}
 %check
@@ -270,15 +274,7 @@ export LD_LIBRARY_PATH=$PWD/%{_vpath_builddir}/bin
 %files
 %license LICENSE
 %{_libdir}/libllama.so.*
-%{_libdir}/libllama-bench-impl.so.*
-%{_libdir}/libllama-batched-bench-impl.so.*
-%{_libdir}/libllama-cli-impl.so.*
 %{_libdir}/libllama-common.so.*
-%{_libdir}/libllama-completion-impl.so.*
-%{_libdir}/libllama-fit-params-impl.so.*
-%{_libdir}/libllama-perplexity-impl.so.*
-%{_libdir}/libllama-quantize-impl.so.*
-%{_libdir}/libllama-server-impl.so.*
 %{_libdir}/libmtmd.so.*
 %{_libdir}/libggml.so.*
 %{_libdir}/libggml-base.so.*
@@ -293,7 +289,6 @@ export LD_LIBRARY_PATH=$PWD/%{_vpath_builddir}/bin
 %{_bindir}/llama-batched-bench
 %{_bindir}/llama-bench
 %{_bindir}/llama-cli
-%{_bindir}/llama-debug-template-parser
 %{_bindir}/llama-completion
 %{_bindir}/llama-cvector-generator
 %{_bindir}/llama-export-lora
@@ -305,7 +300,6 @@ export LD_LIBRARY_PATH=$PWD/%{_vpath_builddir}/bin
 %{_bindir}/llama-quantize
 %{_bindir}/llama-results
 %{_bindir}/llama-server
-%{_bindir}/llama-template-analysis
 %{_bindir}/llama-tokenize
 %{_bindir}/llama-tts
 
@@ -318,15 +312,7 @@ export LD_LIBRARY_PATH=$PWD/%{_vpath_builddir}/bin
 %{_includedir}/llama*.h
 %{_includedir}/mtmd*.h
 %{_libdir}/libllama.so
-%{_libdir}/libllama-batched-bench-impl.so
-%{_libdir}/libllama-bench-impl.so
-%{_libdir}/libllama-cli-impl.so
 %{_libdir}/libllama-common.so
-%{_libdir}/libllama-completion-impl.so
-%{_libdir}/libllama-fit-params-impl.so
-%{_libdir}/libllama-perplexity-impl.so
-%{_libdir}/libllama-quantize-impl.so
-%{_libdir}/libllama-server-impl.so
 %{_libdir}/libmtmd.so
 %{_libdir}/libggml.so
 %{_libdir}/libggml-base.so

diff --git a/sources b/sources
index 64e39fa..71e7a56 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (llama.cpp-b10353.tar.gz) = e8e447a82eaf9e83bc6c7987bc9caf384fbc7f4cc14de90fe5be56a087054f9e108696e2be8fc3cdf238963bd6eefbed0d363f8983f0f5f9264fe1c01683a2d4
+SHA512 (llama.cpp-b10630.tar.gz) = 1eb6befd15174ff998f4aa4f30b8d3db6f6b10dd77e321853f30be0564da049fb09ed06b800bd4f640547eb9f92b4e9e74854b328fb0c0f1b0352882f58b4842

^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2026-09-01 14:28 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-09-01 14:28 [rpms/llama-cpp] rawhide: Update to b10630 Tom Rix

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox