Pull request: Improve build tags

Merge in DNS/adguard-home from imp-build-tags to master Squashed commit of the following: commit c15793e04c08097835692568a598b8a8d15f57f4 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Tue Sep 13 19:25:20 2022 +0300 home: imp build tags commit 2b9b68e9fe6942422951f50d90c70143a3509401 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Tue Sep 13 19:23:56 2022 +0300 version: imp build tags commit c0ade3d6ae8885c596fc31312360b25fe992d1e4 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Tue Sep 13 19:20:48 2022 +0300 dhcpd: imp build tags commit 0ca2a73b7c3b721400a0cc6383cc9e60f4961f22 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Tue Sep 13 19:17:22 2022 +0300 aghos: imp build tags commit 733a685b24b56153b96d59cb97c174ad322ff841 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Tue Sep 13 19:13:11 2022 +0300 aghnet: imp build tags
2022-09-13 20:06:23 +03:00 · 2022-09-13 20:06:23 +03:00 · b74b92fc27
parent bc1503af57
commit b74b92fc27
59 changed files with 13 additions and 72 deletions
--- a/internal/aghnet/arpdb_bsd.go
+++ b/internal/aghnet/arpdb_bsd.go
@ -1,5 +1,4 @@
 //go:build darwin || freebsd
-// +build darwin freebsd

 package aghnet

--- a/internal/aghnet/arpdb_bsd_test.go
+++ b/internal/aghnet/arpdb_bsd_test.go
@ -1,5 +1,4 @@
 //go:build darwin || freebsd
-// +build darwin freebsd

 package aghnet

--- a/internal/aghnet/arpdb_linux.go
+++ b/internal/aghnet/arpdb_linux.go
@ -1,5 +1,4 @@
 //go:build linux
-// +build linux

 package aghnet

--- a/internal/aghnet/arpdb_linux_test.go
+++ b/internal/aghnet/arpdb_linux_test.go
@ -1,5 +1,4 @@
 //go:build linux
-// +build linux

 package aghnet

--- a/internal/aghnet/arpdb_openbsd.go
+++ b/internal/aghnet/arpdb_openbsd.go
@ -1,5 +1,4 @@
 //go:build openbsd
-// +build openbsd

 package aghnet

--- a/internal/aghnet/arpdb_openbsd_test.go
+++ b/internal/aghnet/arpdb_openbsd_test.go
@ -1,5 +1,4 @@
 //go:build openbsd
-// +build openbsd

 package aghnet

--- a/internal/aghnet/arpdb_windows.go
+++ b/internal/aghnet/arpdb_windows.go
@ -1,5 +1,4 @@
 //go:build windows
-// +build windows

 package aghnet

--- a/internal/aghnet/arpdb_windows_test.go
+++ b/internal/aghnet/arpdb_windows_test.go
@ -1,5 +1,4 @@
 //go:build windows
-// +build windows

 package aghnet

--- a/internal/aghnet/dhcp_unix.go
+++ b/internal/aghnet/dhcp_unix.go
@ -1,5 +1,4 @@
-//go:build aix || darwin || dragonfly || freebsd || linux || netbsd || openbsd || solaris
-// +build aix darwin dragonfly freebsd linux netbsd openbsd solaris
+//go:build darwin || freebsd || linux || openbsd

 package aghnet

--- a/internal/aghnet/dhcp_windows.go
+++ b/internal/aghnet/dhcp_windows.go
@ -1,5 +1,4 @@
 //go:build windows
-// +build windows

 package aghnet

--- a/internal/aghnet/hostscontainer_linux.go
+++ b/internal/aghnet/hostscontainer_linux.go
@ -1,5 +1,4 @@
 //go:build linux
-// +build linux

 package aghnet

--- a/internal/aghnet/hostscontainer_others.go
+++ b/internal/aghnet/hostscontainer_others.go
@ -1,5 +1,4 @@
 //go:build !(windows || linux)
-// +build !windows,!linux

 package aghnet

--- a/internal/aghnet/hostscontainer_windows.go
+++ b/internal/aghnet/hostscontainer_windows.go
@ -1,5 +1,4 @@
 //go:build windows
-// +build windows

 package aghnet

--- a/internal/aghnet/interfaces_linux.go
+++ b/internal/aghnet/interfaces_linux.go
@ -1,5 +1,4 @@
 //go:build linux
-// +build linux

 package aghnet

--- a/internal/aghnet/interfaces_unix.go
+++ b/internal/aghnet/interfaces_unix.go
@ -1,5 +1,4 @@
-//go:build aix || darwin || dragonfly || freebsd || netbsd || openbsd || solaris
-// +build aix darwin dragonfly freebsd netbsd openbsd solaris
+//go:build darwin || freebsd || openbsd

 package aghnet

--- a/internal/aghnet/interfaces_windows.go
+++ b/internal/aghnet/interfaces_windows.go
@ -1,5 +1,4 @@
 //go:build windows
-// +build windows

 package aghnet

--- a/internal/aghnet/ipset_linux.go
+++ b/internal/aghnet/ipset_linux.go
@ -1,5 +1,4 @@
 //go:build linux
-// +build linux

 package aghnet

--- a/internal/aghnet/ipset_linux_test.go
+++ b/internal/aghnet/ipset_linux_test.go
@ -1,5 +1,4 @@
 //go:build linux
-// +build linux

 package aghnet

--- a/internal/aghnet/ipset_others.go
+++ b/internal/aghnet/ipset_others.go
@ -1,5 +1,4 @@
 //go:build !linux
-// +build !linux

 package aghnet

--- a/internal/aghnet/net_bsd.go
+++ b/internal/aghnet/net_bsd.go
@ -1,5 +1,4 @@
 //go:build darwin || freebsd || openbsd
-// +build darwin freebsd openbsd

 package aghnet

--- a/internal/aghnet/net_darwin.go
+++ b/internal/aghnet/net_darwin.go
@ -1,5 +1,4 @@
 //go:build darwin
-// +build darwin

 package aghnet

--- a/internal/aghnet/net_freebsd.go
+++ b/internal/aghnet/net_freebsd.go
@ -1,5 +1,4 @@
 //go:build freebsd
-// +build freebsd

 package aghnet

--- a/internal/aghnet/net_freebsd_test.go
+++ b/internal/aghnet/net_freebsd_test.go
@ -1,5 +1,4 @@
 //go:build freebsd
-// +build freebsd

 package aghnet

--- a/internal/aghnet/net_linux.go
+++ b/internal/aghnet/net_linux.go
@ -1,5 +1,4 @@
 //go:build linux
-// +build linux

 package aghnet

--- a/internal/aghnet/net_linux_test.go
+++ b/internal/aghnet/net_linux_test.go
@ -1,5 +1,4 @@
 //go:build linux
-// +build linux

 package aghnet

--- a/internal/aghnet/net_openbsd.go
+++ b/internal/aghnet/net_openbsd.go
@ -1,5 +1,4 @@
 //go:build openbsd
-// +build openbsd

 package aghnet

--- a/internal/aghnet/net_openbsd_test.go
+++ b/internal/aghnet/net_openbsd_test.go
@ -1,5 +1,4 @@
 //go:build openbsd
-// +build openbsd

 package aghnet

--- a/internal/aghnet/net_unix.go
+++ b/internal/aghnet/net_unix.go
@ -1,5 +1,4 @@
-//go:build openbsd || freebsd || linux || darwin
-// +build openbsd freebsd linux darwin
+//go:build darwin || freebsd || linux || openbsd

 package aghnet

--- a/internal/aghnet/net_windows.go
+++ b/internal/aghnet/net_windows.go
@ -1,5 +1,4 @@
 //go:build windows
-// +build windows

 package aghnet

--- a/internal/aghnet/systemresolvers_others.go
+++ b/internal/aghnet/systemresolvers_others.go
@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows

 package aghnet

--- a/internal/aghnet/systemresolvers_others_test.go
+++ b/internal/aghnet/systemresolvers_others_test.go
@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows

 package aghnet

--- a/internal/aghnet/systemresolvers_windows.go
+++ b/internal/aghnet/systemresolvers_windows.go
@ -1,5 +1,4 @@
 //go:build windows
-// +build windows

 package aghnet

--- a/internal/aghnet/systemresolvers_windows_test.go
+++ b/internal/aghnet/systemresolvers_windows_test.go
@ -1,5 +1,4 @@
 //go:build windows
-// +build windows

 package aghnet

--- a/internal/aghos/endian_big.go
+++ b/internal/aghos/endian_big.go
@ -1,5 +1,4 @@
 //go:build mips || mips64
-// +build mips mips64

 // This file is an adapted version of github.com/josharian/native.

--- a/internal/aghos/endian_little.go
+++ b/internal/aghos/endian_little.go
@ -1,5 +1,4 @@
 //go:build amd64 || 386 || arm || arm64 || mipsle || mips64le || ppc64le
-// +build amd64 386 arm arm64 mipsle mips64le ppc64le

 // This file is an adapted version of github.com/josharian/native.

--- a/internal/aghos/os_bsd.go
+++ b/internal/aghos/os_bsd.go
@ -1,5 +1,4 @@
-//go:build darwin || netbsd || openbsd
-// +build darwin netbsd openbsd
+//go:build darwin || openbsd

 package aghos

--- a/internal/aghos/os_freebsd.go
+++ b/internal/aghos/os_freebsd.go
@ -1,5 +1,4 @@
 //go:build freebsd
-// +build freebsd

 package aghos

--- a/internal/aghos/os_linux.go
+++ b/internal/aghos/os_linux.go
@ -1,5 +1,4 @@
 //go:build linux
-// +build linux

 package aghos

--- a/internal/aghos/os_unix.go
+++ b/internal/aghos/os_unix.go
@ -1,5 +1,4 @@
 //go:build darwin || freebsd || linux || openbsd
-// +build darwin freebsd linux openbsd

 package aghos

--- a/internal/aghos/os_windows.go
+++ b/internal/aghos/os_windows.go
@ -1,5 +1,4 @@
 //go:build windows
-// +build windows

 package aghos

--- a/internal/aghos/syslog_others.go
+++ b/internal/aghos/syslog_others.go
@ -1,5 +1,4 @@
-//go:build !(windows || plan9)
-// +build !windows,!plan9
+//go:build !windows

 package aghos

--- a/internal/aghos/syslog_windows.go
+++ b/internal/aghos/syslog_windows.go
@ -1,5 +1,4 @@
-//go:build windows || plan9
-// +build windows plan9
+//go:build windows

 package aghos

--- a/internal/aghos/user_unix.go
+++ b/internal/aghos/user_unix.go
@ -1,5 +1,4 @@
-//go:build darwin || freebsd || linux || netbsd || openbsd
-// +build darwin freebsd linux netbsd openbsd
+//go:build darwin || freebsd || linux || openbsd

 package aghos

--- a/internal/aghos/user_windows.go
+++ b/internal/aghos/user_windows.go
@ -1,5 +1,4 @@
 //go:build windows
-// +build windows

 package aghos

--- a/internal/dhcpd/broadcast_bsd.go
+++ b/internal/dhcpd/broadcast_bsd.go
@ -1,5 +1,4 @@
 //go:build freebsd || openbsd
-// +build freebsd openbsd

 package dhcpd

--- a/internal/dhcpd/broadcast_bsd_test.go
+++ b/internal/dhcpd/broadcast_bsd_test.go
@ -1,5 +1,4 @@
 //go:build freebsd || openbsd
-// +build freebsd openbsd

 package dhcpd

--- a/internal/dhcpd/broadcast_others.go
+++ b/internal/dhcpd/broadcast_others.go
@ -1,5 +1,4 @@
-//go:build aix || darwin || dragonfly || linux || netbsd || solaris
-// +build aix darwin dragonfly linux netbsd solaris
+//go:build darwin || linux

 package dhcpd

--- a/internal/dhcpd/broadcast_others_test.go
+++ b/internal/dhcpd/broadcast_others_test.go
@ -1,5 +1,4 @@
-//go:build aix || darwin || dragonfly || linux || netbsd || solaris
-// +build aix darwin dragonfly linux netbsd solaris
+//go:build darwin || linux

 package dhcpd

--- a/internal/dhcpd/conn_unix.go
+++ b/internal/dhcpd/conn_unix.go
@ -1,5 +1,4 @@
-//go:build aix || darwin || dragonfly || freebsd || linux || netbsd || openbsd || solaris
-// +build aix darwin dragonfly freebsd linux netbsd openbsd solaris
+//go:build darwin || freebsd || linux || openbsd

 package dhcpd

--- a/internal/dhcpd/conn_unix_test.go
+++ b/internal/dhcpd/conn_unix_test.go
@ -1,5 +1,4 @@
-//go:build aix || darwin || dragonfly || freebsd || linux || netbsd || openbsd || solaris
-// +build aix darwin dragonfly freebsd linux netbsd openbsd solaris
+//go:build darwin || freebsd || linux || openbsd

 package dhcpd

--- a/internal/dhcpd/options_unix.go
+++ b/internal/dhcpd/options_unix.go
@ -1,5 +1,4 @@
-//go:build aix || darwin || dragonfly || freebsd || linux || netbsd || openbsd || solaris
-// +build aix darwin dragonfly freebsd linux netbsd openbsd solaris
+//go:build darwin || freebsd || linux || openbsd

 package dhcpd

--- a/internal/dhcpd/options_unix_test.go
+++ b/internal/dhcpd/options_unix_test.go
@ -1,5 +1,4 @@
-//go:build aix || darwin || dragonfly || freebsd || linux || netbsd || openbsd || solaris
-// +build aix darwin dragonfly freebsd linux netbsd openbsd solaris
+//go:build darwin || freebsd || linux || openbsd

 package dhcpd

--- a/internal/dhcpd/os_windows.go
+++ b/internal/dhcpd/os_windows.go
@ -1,5 +1,4 @@
 //go:build windows
-// +build windows

 package dhcpd

--- a/internal/dhcpd/v46_windows.go
+++ b/internal/dhcpd/v46_windows.go
@ -1,5 +1,4 @@
 //go:build windows
-// +build windows

 package dhcpd

--- a/internal/home/service_linux.go
+++ b/internal/home/service_linux.go
@ -1,5 +1,4 @@
 //go:build linux
-// +build linux

 package home

--- a/internal/home/service_openbsd.go
+++ b/internal/home/service_openbsd.go
@ -1,5 +1,4 @@
 //go:build openbsd
-// +build openbsd

 package home

--- a/internal/home/service_others.go
+++ b/internal/home/service_others.go
@ -1,5 +1,4 @@
 //go:build !(openbsd || linux)
-// +build !openbsd,!linux

 package home

--- a/internal/version/norace.go
+++ b/internal/version/norace.go
@ -1,5 +1,4 @@
 //go:build !race
-// +build !race

 package version

--- a/internal/version/race.go
+++ b/internal/version/race.go
@ -1,5 +1,4 @@
 //go:build race
-// +build race

 package version