From 207174b69e297eb7f3252bc81e8f07c48a4ee26b Mon Sep 17 00:00:00 2001 From: David Elsing Date: Sat, 23 Mar 2024 22:04:50 +0000 Subject: gnu: Remove flatbuffers-next-shared. * gnu/packages/serialization.scm (flatbuffers-next-shared): Delete variable. * gnu/packages/machine-learning.scm (tensorflow-lite)[arguments]: Use flatbuffers-next instead of flatbuffers-next-shared. --- gnu/packages/machine-learning.scm | 5 +++-- gnu/packages/serialization.scm | 11 ----------- 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm index afa4254160..7646572aa4 100644 --- a/gnu/packages/machine-learning.scm +++ b/gnu/packages/machine-learning.scm @@ -27,6 +27,7 @@ ;;; Copyright © 2024 David Pflug ;;; Copyright © 2024 Timothee Mathieu ;;; Copyright © 2024 Spencer King +;;; Copyright © 2024 David Elsing ;;; ;;; This file is part of GNU Guix. ;;; @@ -3387,7 +3388,7 @@ advanced research.") (string-append "-DEigen3_DIR=" #$(this-package-input "eigen") "/share/eigen3/cmake") (string-append "-DFlatBuffers_DIR=" - #$(this-package-input "flatbuffers-shared") + #$(this-package-input "flatbuffers") "/lib/cmake/flatbuffers") (string-append "-DNEON_2_SSE_DIR=" #$(this-package-input "neon2sse") "/lib/cmake/NEON_2_SSE") @@ -3474,7 +3475,7 @@ advanced research.") ("cpuinfo" ,cpuinfo) ("eigen" ,eigen) ("fp16" ,fp16) - ("flatbuffers-shared" ,flatbuffers-next-shared) + ("flatbuffers" ,flatbuffers-next) ("gemmlowp" ,gemmlowp) ("mesa-headers" ,mesa-headers) ("neon2sse" ,neon2sse) diff --git a/gnu/packages/serialization.scm b/gnu/packages/serialization.scm index 7c00303fbf..755852806c 100644 --- a/gnu/packages/serialization.scm +++ b/gnu/packages/serialization.scm @@ -913,17 +913,6 @@ game development and other performance-critical applications.") (base32 "1z3a6l8g2y53i5xzraswfs2i0i3kk52zv7nzc2q3fgisbyiri3pz")))))) -(define-public flatbuffers-next-shared - (package - (inherit flatbuffers-next) - (name "flatbuffers-shared") - (version "23.1.21") - (arguments - (substitute-keyword-arguments (package-arguments flatbuffers-next) - ((#:configure-flags flags) - ;; Compile with -fPIC, needed for shared lib. - #~(cons "-DFLATBUFFERS_CXX_FLAGS=-fPIC" #$flags)))))) - (define-public python-flatbuffers (package (name "python-flatbuffers") -- cgit v1.2.3