From 2aa9e337eefb3fed5cc5a3d7e3331456b95b2cc8 Mon Sep 17 00:00:00 2001
From: Manuela Kuhn <36827019+manuelakuhn@users.noreply.github.com>
Date: Sat, 26 Jun 2021 11:25:47 +0200
Subject: [PATCH] soci: add 4.0.2 and multiple variants (#24543)

Fix url to find newer versions, add newest version 4.0.2 and add
variants for
- cxxstd: To use a specific c++ standard
- static: Enable or disable build of static libraries
- boost: Boost support
- sqlite: SQLite support
- postgresql: PostgreSQL support
---
 .../repos/builtin/packages/soci/package.py    | 40 +++++++++++++++++--
 1 file changed, 37 insertions(+), 3 deletions(-)

diff --git a/var/spack/repos/builtin/packages/soci/package.py b/var/spack/repos/builtin/packages/soci/package.py
index 0d960942b9..88a6a47b9d 100644
--- a/var/spack/repos/builtin/packages/soci/package.py
+++ b/var/spack/repos/builtin/packages/soci/package.py
@@ -10,8 +10,42 @@ class Soci(CMakePackage):
     """Official repository of the SOCI - The C++ Database Access Library"""
 
     homepage = "https://github.com/SOCI/soci"
-    url      = "https://github.com/SOCI/soci/archive/4.0.0.tar.gz"
+    url      = "https://github.com/SOCI/soci/archive/v4.0.2.tar.gz"
 
+    version('4.0.2', sha256='f293192a412ed82693d17dfe46e2734b140bff835bc3259e3cbd7c315e5e2d74')
     version('4.0.0', sha256='359b988d8cbe81357835317821919f7e270c0705e41951a92ac1627cb9fe8faf')
-    version('3.2.3', sha256='1166664d5d7c4552c4c2abf173f98fa4427fbb454930fd04de3a39782553199e')
-    version('3.2.2', sha256='cf1a6130ebdf0b84d246da948874ab1312c317e2ec659ede732b688667c355f4')
+    version('3.2.3', sha256='1166664d5d7c4552c4c2abf173f98fa4427fbb454930fd04de3a39782553199e',
+            url="https://github.com/SOCI/soci/archive/3.2.3.tar.gz")
+    version('3.2.2', sha256='cf1a6130ebdf0b84d246da948874ab1312c317e2ec659ede732b688667c355f4',
+            url="https://github.com/SOCI/soci/archive/3.2.2.tar.gz")
+
+    variant('cxxstd', default=11, values=('98', '11', '14', '17', '20'),
+            multi=False, description='Use the specified C++ standard when building')
+
+    variant('static', default=True, description='Enable build of static libraries')
+    variant('boost', default=False, description='Build with Boost support')
+    variant('sqlite', default=False, description='Build with SQLite support')
+    variant('postgresql', default=False, description='Build with PostgreSQL support')
+
+    depends_on('boost', when='+boost')
+    depends_on('sqlite', when='+sqlite')
+    depends_on('postgresql+client_only', when='+postgresql')
+
+    @property
+    def root_cmakelists_dir(self):
+        if self.spec.satisfies('@:3'):
+            return 'src'
+        else:
+            return self.stage.source_path
+
+    def cmake_args(self):
+        args = [
+            # SOCI_STATIC does not work with BOOL:OFF
+            '-DSOCI_STATIC=' + ('ON' if '+static' in self.spec else 'OFF'),
+            self.define_from_variant('CMAKE_CXX_STANDARD', 'cxxstd'),
+            self.define_from_variant('WITH_BOOST', 'boost'),
+            self.define_from_variant('WITH_SQLITE3', 'sqlite'),
+            self.define_from_variant('WITH_POSTGRESQL', 'postgresql'),
+        ]
+
+        return args