summaryrefslogtreecommitdiff
path: root/var
diff options
context:
space:
mode:
authorHarmen Stoppels <me@harmenstoppels.nl>2023-12-22 23:59:54 +0100
committerGitHub <noreply@github.com>2023-12-22 23:59:54 +0100
commit0d449756ddd79241f215d0b099d1d0661294cb66 (patch)
treea8a917aaa77d18b0869daf818daad90245f7f670 /var
parentbc4ecccfbf5302580c285c8ec1d90cb26cea7005 (diff)
downloadspack-0d449756ddd79241f215d0b099d1d0661294cb66.tar.gz
spack-0d449756ddd79241f215d0b099d1d0661294cb66.tar.bz2
spack-0d449756ddd79241f215d0b099d1d0661294cb66.tar.xz
spack-0d449756ddd79241f215d0b099d1d0661294cb66.zip
Revert "sqlite: add NMake build system for Windows (#41761)" (#41840)
This reverts commit 94fc2314f163b1f8dcdf072c4b66afccff9c83b4.
Diffstat (limited to 'var')
-rw-r--r--var/spack/repos/builtin/packages/sqlite/package.py107
1 files changed, 36 insertions, 71 deletions
diff --git a/var/spack/repos/builtin/packages/sqlite/package.py b/var/spack/repos/builtin/packages/sqlite/package.py
index b9587971bb..1989031470 100644
--- a/var/spack/repos/builtin/packages/sqlite/package.py
+++ b/var/spack/repos/builtin/packages/sqlite/package.py
@@ -10,13 +10,12 @@ import spack.platforms
from spack.package import *
-class Sqlite(AutotoolsPackage, NMakePackage):
+class Sqlite(AutotoolsPackage):
"""SQLite is a C-language library that implements a small, fast,
self-contained, high-reliability, full-featured, SQL database engine.
"""
homepage = "https://www.sqlite.org"
- tags = ["windows"]
version("3.43.2", sha256="6d422b6f62c4de2ca80d61860e3a3fb693554d2f75bb1aaca743ccc4d6f609f0")
version("3.42.0", sha256="7abcfd161c6e2742ca5c6c0895d1f853c940f203304a0b49da4e1eca5d088ca6")
@@ -48,40 +47,20 @@ class Sqlite(AutotoolsPackage, NMakePackage):
# All versions prior to 3.26.0 are vulnerable to Magellan when FTS
# is enabled, see https://blade.tencent.com/magellan/index_en.html
- # no hard readline dep on Windows + no variant support, makefile has minimal to no options
- for plat in ["linux", "darwin", "cray", "freebsd"]:
- variant(
- "functions",
- default=False,
- description="Provide mathematical and string extension functions for SQL "
- "queries using the loadable extensions mechanism",
- when=f"+dynamic_extensions platform={plat}",
- )
- variant(
- "fts",
- default=True,
- description="Include fts4 and fts5 support",
- when=f"platform={plat}",
- )
- variant(
- "column_metadata",
- default=True,
- description="Build with COLUMN_METADATA",
- when=f"platform={plat}",
- )
- variant(
- "dynamic_extensions",
- default=True,
- description="Support loadable extensions",
- when=f"platform={plat}",
- )
- variant(
- "rtree", default=True, description="Build with Rtree module", when=f"platform={plat}"
- )
- depends_on("readline", when=f"platform={plat}")
+ variant(
+ "functions",
+ default=False,
+ when="+dynamic_extensions",
+ description="Provide mathematical and string extension functions for SQL "
+ "queries using the loadable extensions mechanism",
+ )
+ variant("fts", default=True, description="Include fts4 and fts5 support")
+ variant("column_metadata", default=True, description="Build with COLUMN_METADATA")
+ variant("dynamic_extensions", default=True, description="Support loadable extensions")
+ variant("rtree", default=True, description="Build with Rtree module")
+ depends_on("readline")
depends_on("zlib-api")
- depends_on("tcl", when="platform=windows")
# See https://blade.tencent.com/magellan/index_en.html
conflicts("+fts", when="@:3.25")
@@ -108,8 +87,6 @@ class Sqlite(AutotoolsPackage, NMakePackage):
# compiler is used.
patch("remove_overflow_builtins.patch", when="@3.17.0:3.20%intel")
- build_system("autotools", "nmake")
-
executables = ["^sqlite3$"]
@classmethod
@@ -211,34 +188,6 @@ class Sqlite(AutotoolsPackage, NMakePackage):
host_platform = spack.platforms.host()
return str(host_platform.target("default_target"))
- def test_example(self):
- """check example table dump"""
-
- test_data_dir = self.test_suite.current_test_data_dir
- db_filename = test_data_dir.join("packages.db")
-
- # Ensure the database only contains one table
- sqlite3 = which(self.prefix.bin.sqlite3)
- out = sqlite3(db_filename, ".tables", output=str.split, error=str.split)
- assert "packages" in out
-
- # Ensure the database dump matches expectations, where special
- # characters are replaced with spaces in the expected and actual
- # output to avoid pattern errors.
- expected = get_escaped_text_output(test_data_dir.join("dump.out"))
- out = sqlite3(db_filename, ".dump", output=str.split, error=str.split)
- check_outputs(expected, out)
-
- def test_version(self):
- """ensure version is expected"""
- vers_str = str(self.spec.version)
-
- sqlite3 = which(self.prefix.bin.sqlite3)
- out = sqlite3("-version", output=str.split, error=str.split)
- assert vers_str in out
-
-
-class AutotoolsBuilder(spack.build_systems.autotools.AutotoolsBuilder):
def configure_args(self):
args = []
@@ -275,12 +224,28 @@ class AutotoolsBuilder(spack.build_systems.autotools.AutotoolsBuilder):
)
install(libraryname, self.prefix.lib)
+ def test_example(self):
+ """check example table dump"""
-class NMakeBuilder(spack.build_systems.nmake.NMakeBuilder):
- @property
- def makefile_name(self):
- return "Makefile.msc"
+ test_data_dir = self.test_suite.current_test_data_dir
+ db_filename = test_data_dir.join("packages.db")
- def nmake_args(self):
- args = [self.define("TCLDIR", self.spec["tcl"].prefix)]
- return args
+ # Ensure the database only contains one table
+ sqlite3 = which(self.prefix.bin.sqlite3)
+ out = sqlite3(db_filename, ".tables", output=str.split, error=str.split)
+ assert "packages" in out
+
+ # Ensure the database dump matches expectations, where special
+ # characters are replaced with spaces in the expected and actual
+ # output to avoid pattern errors.
+ expected = get_escaped_text_output(test_data_dir.join("dump.out"))
+ out = sqlite3(db_filename, ".dump", output=str.split, error=str.split)
+ check_outputs(expected, out)
+
+ def test_version(self):
+ """ensure version is expected"""
+ vers_str = str(self.spec.version)
+
+ sqlite3 = which(self.prefix.bin.sqlite3)
+ out = sqlite3("-version", output=str.split, error=str.split)
+ assert vers_str in out