Removed the NetworkBSD build flag

Debian stable and the i386ancient build both have a new enough network
to not need this flag any longer.

Sponsored-by: Svenne Krap on Patreon
This commit is contained in:
Joey Hess 2022-03-22 11:52:24 -04:00
parent 982eb7ed0d
commit a460aa8b70
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
4 changed files with 4 additions and 12 deletions

View file

@ -37,6 +37,7 @@ git-annex (10.20220223) UNRELEASED; urgency=medium
* test: Added --jobs option. * test: Added --jobs option.
* Removed vendored copy of http-client-restricted, and removed the * Removed vendored copy of http-client-restricted, and removed the
HttpClientRestricted build flag that avoided that dependency. HttpClientRestricted build flag that avoided that dependency.
* Removed the NetworkBSD build flag.
-- Joey Hess <id@joeyh.name> Wed, 23 Feb 2022 14:14:09 -0400 -- Joey Hess <id@joeyh.name> Wed, 23 Feb 2022 14:14:09 -0400

View file

@ -284,10 +284,6 @@ Flag DebugLocks
Flag Dbus Flag Dbus
Description: Enable dbus support Description: Enable dbus support
Flag NetworkBSD
Description: Build with network-3.0 which split out network-bsd
Default: True
Flag GitLfs Flag GitLfs
Description: Build with git-lfs library (rather than vendored copy) Description: Build with git-lfs library (rather than vendored copy)
Default: True Default: True
@ -377,7 +373,9 @@ Executable git-annex
tasty-rerun, tasty-rerun,
ansi-terminal >= 0.9, ansi-terminal >= 0.9,
aws (>= 0.20), aws (>= 0.20),
DAV (>= 1.0) DAV (>= 1.0),
network (>= 3.0.0.0),
network-bsd
CC-Options: -Wall CC-Options: -Wall
GHC-Options: -Wall -fno-warn-tabs -Wincomplete-uni-patterns GHC-Options: -Wall -fno-warn-tabs -Wincomplete-uni-patterns
Default-Language: Haskell2010 Default-Language: Haskell2010
@ -411,11 +409,6 @@ Executable git-annex
else else
Build-Depends: unix (>= 2.7.2) Build-Depends: unix (>= 2.7.2)
if flag(NetworkBSD)
Build-Depends: network-bsd, network (>= 3.0.0.0)
else
Build-Depends: network (< 3.0.0.0), network (>= 2.6.3.0)
if flag(GitLfs) if flag(GitLfs)
Build-Depends: git-lfs (>= 1.2.0) Build-Depends: git-lfs (>= 1.2.0)
CPP-Options: -DWITH_GIT_LFS CPP-Options: -DWITH_GIT_LFS

View file

@ -9,7 +9,6 @@ flags:
dbus: false dbus: false
debuglocks: false debuglocks: false
benchmark: true benchmark: true
networkbsd: true
gitlfs: true gitlfs: true
packages: packages:
- '.' - '.'

View file

@ -9,7 +9,6 @@ flags:
dbus: false dbus: false
debuglocks: false debuglocks: false
benchmark: false benchmark: false
networkbsd: true
gitlfs: true gitlfs: true
packages: packages:
- '.' - '.'