From fb3e1ab79a5c95d5245417ccfd73d0d76e954507 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Thu, 13 Jun 2024 22:34:34 -0400 Subject: [PATCH] gnu: soci: Use gexps and remove inputs labels. * gnu/packages/databases.scm (soci) [propagated-inputs]: Remove labels. [configure-flags]: Use gexps. Change-Id: I7e96296255c41ca46a1cb1e4c9b1e73fbbc286d8 --- gnu/packages/databases.scm | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 1500fbe145a6f6426e508e6c9abb2efcad3edf80..31692bab35a77476a2cd6d4f686b1285b26888fc 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -5807,20 +5807,21 @@ The drivers officially supported by @code{libdbi} are: (build-system cmake-build-system) (propagated-inputs ;; Headers of soci has include-references to headers of these inputs. - `(("firebird" ,firebird) - ("postgresql" ,postgresql) - ("sqlite" ,sqlite) - ("odbc" ,unixodbc) - ("boost" ,boost) - ("mariadb:dev" ,mariadb "dev"))) + (list firebird + postgresql + sqlite + unixodbc + boost + `(,mariadb "dev"))) (arguments - `(#:configure-flags - ;; C++11 (-DSOCI_CXX11) is OFF by default. hyperledger-iroha needs it. - (list "-DCMAKE_CXX_STANDARD=17" - "-DSOCI_LIBDIR=lib" - ;; This is for relocation when linking statically - "-DCMAKE_CXX_FLAGS=-fPIE") - #:tests? #f)) ; may require running database management systems + (list #:configure-flags + ;; C++11 (-DSOCI_CXX11) is OFF by default. hyperledger-iroha needs + ;; it. + #~(list "-DCMAKE_CXX_STANDARD=17" + "-DSOCI_LIBDIR=lib" + ;; This is for relocation when linking statically + "-DCMAKE_CXX_FLAGS=-fPIE") + #:tests? #f)) ; may require running database management systems (synopsis "C++ Database Access Library") (description "SOCI is an abstraction layer for several database backends, including