Remove sqlite3_nosys.

2026-01-11 21:49:13 +00:00 · 2024-11-29 15:51:51 +00:00
parent a44690035f
commit 2e3ba3949e
34 changed files with 29 additions and 42 deletions
--- a/.github/workflows/cross.sh
+++ b/.github/workflows/cross.sh
@@ -18,12 +18,8 @@ echo js            ; GOOS=js        GOARCH=wasm  go build .
 echo wasip1        ; GOOS=wasip1    GOARCH=wasm  go build .
 echo linux-flock   ; GOOS=linux     GOARCH=amd64 go build -tags sqlite3_flock .
 echo linux-dotlk   ; GOOS=linux     GOARCH=amd64 go build -tags sqlite3_dotlk .
-echo linux-nosys   ; GOOS=linux     GOARCH=amd64 go build -tags sqlite3_nosys .
 echo darwin-flock  ; GOOS=darwin    GOARCH=amd64 go build -tags sqlite3_flock .
 echo darwin-dotlk  ; GOOS=darwin    GOARCH=amd64 go build -tags sqlite3_dotlk .
-echo darwin-nosys  ; GOOS=darwin    GOARCH=amd64 go build -tags sqlite3_nosys .
 echo windows-dotlk ; GOOS=windows   GOARCH=amd64 go build -tags sqlite3_dotlk .
-echo windows-nosys ; GOOS=windows   GOARCH=amd64 go build -tags sqlite3_nosys .
 echo freebsd-dotlk ; GOOS=freebsd   GOARCH=amd64 go build -tags sqlite3_dotlk .
-echo freebsd-nosys ; GOOS=freebsd   GOARCH=amd64 go build -tags sqlite3_nosys .
 echo solaris-dotlk ; GOOS=solaris   GOARCH=amd64 go build -tags sqlite3_dotlk .
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -54,10 +54,6 @@ jobs:
    - name: Test
      run: go test -v ./... -bench . -benchtime=1x

-    - name: Test no locks
-      run: go test -v -tags sqlite3_nosys ./...
-      if: matrix.os == 'ubuntu-latest'
-
    - name: Test BSD locks
      run: go test -v -tags sqlite3_flock ./...
      if: matrix.os == 'macos-latest'
--- a/driver/example2_test.go
+++ b/driver/example2_test.go
@@ -1,4 +1,4 @@
-//go:build (linux || darwin || windows || freebsd || openbsd || netbsd || dragonfly || illumos || sqlite3_flock) && !sqlite3_nosys
+//go:build linux || darwin || windows || freebsd || openbsd || netbsd || dragonfly || illumos || sqlite3_flock || sqlite3_dotlk

 package driver_test

--- a/driver/example_test.go
+++ b/driver/example_test.go
@@ -1,4 +1,4 @@
-//go:build ((linux || darwin || windows || freebsd || openbsd || netbsd || dragonfly || illumos) && !sqlite3_nosys) || sqlite3_flock || sqlite3_dotlk
+//go:build linux || darwin || windows || freebsd || openbsd || netbsd || dragonfly || illumos || sqlite3_flock || sqlite3_dotlk

 package driver_test

--- a/internal/alloc/alloc_other.go
+++ b/internal/alloc/alloc_other.go
@@ -1,4 +1,4 @@
-//go:build !(unix || windows) || sqlite3_nosys
+//go:build !unix && !windows

 package alloc

--- a/internal/alloc/alloc_unix.go
+++ b/internal/alloc/alloc_unix.go
@@ -1,4 +1,4 @@
-//go:build unix && !sqlite3_nosys
+//go:build unix

 package alloc

--- a/internal/alloc/alloc_windows.go
+++ b/internal/alloc/alloc_windows.go
@@ -1,5 +1,3 @@
-//go:build !sqlite3_nosys
-
 package alloc

 import (
--- a/internal/util/mmap_other.go
+++ b/internal/util/mmap_other.go
@@ -1,4 +1,4 @@
-//go:build !unix || sqlite3_nosys
+//go:build !unix

 package util

--- a/internal/util/mmap_unix.go
+++ b/internal/util/mmap_unix.go
@@ -1,4 +1,4 @@
-//go:build unix && !sqlite3_nosys
+//go:build unix

 package util

--- a/internal/util/mmap_windows.go
+++ b/internal/util/mmap_windows.go
@@ -1,5 +1,3 @@
-//go:build !sqlite3_nosys
-
 package util

 import (
--- a/tests/bradfitz/sql_test.go
+++ b/tests/bradfitz/sql_test.go
@@ -1,4 +1,4 @@
-//go:build ((linux || darwin || windows || freebsd || openbsd || netbsd || dragonfly || illumos) && !sqlite3_nosys) || sqlite3_flock || sqlite3_dotlk
+//go:build linux || darwin || windows || freebsd || openbsd || netbsd || dragonfly || illumos || sqlite3_flock || sqlite3_dotlk

 package bradfitz

--- a/vfs/README.md
+++ b/vfs/README.md
@@ -91,7 +91,6 @@ The implementation is compatible with SQLite's
 The VFS can be customized with a few build tags:
 - `sqlite3_flock` forces the use of BSD locks.
 - `sqlite3_dotlk` forces the use of dot-file locks.
- `sqlite3_nosys` prevents importing [`x/sys`](https://pkg.go.dev/golang.org/x/sys).

 > [!IMPORTANT]
 > The default configuration of this package is compatible with the standard
--- a/vfs/adiantum/example_test.go
+++ b/vfs/adiantum/example_test.go
@@ -1,4 +1,4 @@
-//go:build ((linux || darwin || windows || freebsd || openbsd || netbsd || dragonfly || illumos) && !sqlite3_nosys) || sqlite3_flock || sqlite3_dotlk
+//go:build linux || darwin || windows || freebsd || openbsd || netbsd || dragonfly || illumos || sqlite3_flock || sqlite3_dotlk

 package adiantum_test

--- a/vfs/lock.go
+++ b/vfs/lock.go
@@ -1,4 +1,4 @@
-//go:build ((linux || darwin || windows || freebsd || openbsd || netbsd || dragonfly || illumos) && !sqlite3_nosys) || sqlite3_flock || sqlite3_dotlk
+//go:build linux || darwin || windows || freebsd || openbsd || netbsd || dragonfly || illumos || sqlite3_flock || sqlite3_dotlk

 package vfs

--- a/vfs/lock_other.go
+++ b/vfs/lock_other.go
@@ -1,4 +1,4 @@
-//go:build !(((linux || darwin || windows || freebsd || openbsd || netbsd || dragonfly || illumos) && !sqlite3_nosys) || sqlite3_flock || sqlite3_dotlk)
+//go:build !(linux || darwin || windows || freebsd || openbsd || netbsd || dragonfly || illumos || sqlite3_flock || sqlite3_dotlk)

 package vfs

--- a/vfs/os_bsd.go
+++ b/vfs/os_bsd.go
@@ -1,4 +1,4 @@
-//go:build ((freebsd || openbsd || netbsd || dragonfly || illumos) && !(sqlite3_dotlk || sqlite3_nosys)) || sqlite3_flock
+//go:build ((freebsd || openbsd || netbsd || dragonfly || illumos) && !sqlite3_dotlk) || sqlite3_flock

 package vfs

--- a/vfs/os_darwin.go
+++ b/vfs/os_darwin.go
@@ -1,4 +1,4 @@
-//go:build !(sqlite3_flock || sqlite3_nosys)
+//go:build !sqlite3_flock

 package vfs

--- a/vfs/os_f2fs_linux.go
+++ b/vfs/os_f2fs_linux.go
@@ -1,4 +1,4 @@
-//go:build (amd64 || arm64 || riscv64) && !sqlite3_nosys
+//go:build amd64 || arm64 || riscv64

 package vfs

--- a/vfs/os_linux.go
+++ b/vfs/os_linux.go
@@ -1,4 +1,4 @@
-//go:build !(sqlite3_flock || sqlite3_nosys)
+//go:build !sqlite3_flock

 package vfs

--- a/vfs/os_ofd.go
+++ b/vfs/os_ofd.go
@@ -1,4 +1,4 @@
-//go:build (linux || darwin) && !(sqlite3_flock || sqlite3_dotlk || sqlite3_nosys)
+//go:build (linux || darwin) && !(sqlite3_flock || sqlite3_dotlk)

 package vfs

--- a/vfs/os_std.go
+++ b/vfs/os_std.go
@@ -1,4 +1,4 @@
-//go:build !unix || sqlite3_nosys
+//go:build !unix

 package vfs

--- a/vfs/os_std_alloc.go
+++ b/vfs/os_std_alloc.go
@@ -1,4 +1,4 @@
-//go:build !(linux || darwin) || sqlite3_flock || sqlite3_nosys
+//go:build !(linux || darwin) || sqlite3_flock

 package vfs

--- a/vfs/os_std_atomic.go
+++ b/vfs/os_std_atomic.go
@@ -1,4 +1,4 @@
-//go:build !linux || !(amd64 || arm64 || riscv64) || sqlite3_nosys
+//go:build !linux || !(amd64 || arm64 || riscv64)

 package vfs

--- a/vfs/os_std_sync.go
+++ b/vfs/os_std_sync.go
@@ -1,4 +1,4 @@
-//go:build !(linux || darwin) || sqlite3_flock || sqlite3_nosys
+//go:build !(linux || darwin) || sqlite3_flock

 package vfs

--- a/vfs/os_unix.go
+++ b/vfs/os_unix.go
@@ -1,4 +1,4 @@
-//go:build unix && !sqlite3_nosys
+//go:build unix

 package vfs

--- a/vfs/os_unix_test.go
+++ b/vfs/os_unix_test.go
@@ -1,4 +1,4 @@
-//go:build unix && !(sqlite3_flock || sqlite3_nosys)
+//go:build unix && !sqlite3_flock

 package vfs

--- a/vfs/os_windows.go
+++ b/vfs/os_windows.go
@@ -1,4 +1,4 @@
-//go:build !(sqlite3_dotlk || sqlite3_nosys)
+//go:build !sqlite3_dotlk

 package vfs

--- a/vfs/shm.go
+++ b/vfs/shm.go
@@ -1,4 +1,4 @@
-//go:build ((linux || darwin || windows || freebsd || openbsd || netbsd || dragonfly || illumos) && (386 || arm || amd64 || arm64 || riscv64 || ppc64le) && !sqlite3_nosys) || sqlite3_flock || sqlite3_dotlk
+//go:build ((linux || darwin || windows || freebsd || openbsd || netbsd || dragonfly || illumos) && (386 || arm || amd64 || arm64 || riscv64 || ppc64le)) || sqlite3_flock || sqlite3_dotlk

 package vfs

--- a/vfs/shm_bsd.go
+++ b/vfs/shm_bsd.go
@@ -1,4 +1,4 @@
-//go:build ((freebsd || openbsd || netbsd || dragonfly || illumos) && (386 || arm || amd64 || arm64 || riscv64 || ppc64le) && !(sqlite3_dotlk || sqlite3_nosys)) || sqlite3_flock
+//go:build ((freebsd || openbsd || netbsd || dragonfly || illumos) && (386 || arm || amd64 || arm64 || riscv64 || ppc64le) && !sqlite3_dotlk) || sqlite3_flock

 package vfs

--- a/vfs/shm_copy.go
+++ b/vfs/shm_copy.go
@@ -1,4 +1,4 @@
-//go:build (windows && (386 || arm || amd64 || arm64 || riscv64 || ppc64le) && !sqlite3_nosys) || sqlite3_dotlk
+//go:build (windows && (386 || arm || amd64 || arm64 || riscv64 || ppc64le)) || sqlite3_dotlk

 package vfs

--- a/vfs/shm_memlk.go
+++ b/vfs/shm_memlk.go
@@ -1,4 +1,4 @@
-//go:build ((freebsd || openbsd || netbsd || dragonfly || illumos) && (386 || arm || amd64 || arm64 || riscv64 || ppc64le) && !sqlite3_nosys) || sqlite3_flock || sqlite3_dotlk
+//go:build ((freebsd || openbsd || netbsd || dragonfly || illumos) && (386 || arm || amd64 || arm64 || riscv64 || ppc64le)) || sqlite3_flock || sqlite3_dotlk

 package vfs

--- a/vfs/shm_ofd.go
+++ b/vfs/shm_ofd.go
@@ -1,4 +1,4 @@
-//go:build (linux || darwin) && (386 || arm || amd64 || arm64 || riscv64 || ppc64le) && !(sqlite3_flock || sqlite3_dotlk || sqlite3_nosys)
+//go:build (linux || darwin) && (386 || arm || amd64 || arm64 || riscv64 || ppc64le) && !(sqlite3_flock || sqlite3_dotlk)

 package vfs

--- a/vfs/shm_other.go
+++ b/vfs/shm_other.go
@@ -1,4 +1,4 @@
-//go:build !(((linux || darwin || windows || freebsd || openbsd || netbsd || dragonfly || illumos) && (386 || arm || amd64 || arm64 || riscv64 || ppc64le) && !sqlite3_nosys) || sqlite3_flock || sqlite3_dotlk)
+//go:build !(((linux || darwin || windows || freebsd || openbsd || netbsd || dragonfly || illumos) && (386 || arm || amd64 || arm64 || riscv64 || ppc64le)) || sqlite3_flock || sqlite3_dotlk)

 package vfs

--- a/vfs/shm_windows.go
+++ b/vfs/shm_windows.go
@@ -1,4 +1,4 @@
-//go:build (386 || arm || amd64 || arm64 || riscv64 || ppc64le) && !(sqlite3_dotlk || sqlite3_nosys)
+//go:build (386 || arm || amd64 || arm64 || riscv64 || ppc64le) && !sqlite3_dotlk

 package vfs