Skip to content

Rewrite build tags so they are no longer required #26

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
erikh wants to merge 1 commit into from
Closed

Rewrite build tags so they are no longer required #26

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion drivers/btrfs/version.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// +build linux,!btrfs_noversion
// +build linux,btrfs_version

package btrfs

Expand Down
2 changes: 1 addition & 1 deletion drivers/btrfs/version_none.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// +build linux,btrfs_noversion
// +build linux,!btrfs_version

package btrfs

Expand Down
2 changes: 1 addition & 1 deletion drivers/btrfs/version_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// +build linux,!btrfs_noversion
// +build linux,btrfs_version

package btrfs

Expand Down
10 changes: 5 additions & 5 deletions hack/make.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,21 +91,21 @@ if [ "$EXPERIMENTAL" ]; then
BUILDTAGS+=" experimental"
fi

# test whether "btrfs/version.h" exists and apply btrfs_noversion appropriately
# test whether "btrfs/version.h" exists and apply btrfs_version appropriately
if \
command -v gcc &> /dev/null \
&& ! gcc -E - -o /dev/null &> /dev/null <<<'#include <btrfs/version.h>' \
&& gcc -E - -o /dev/null &> /dev/null <<<'#include <btrfs/version.h>' \
; then
BUILDTAGS+=' btrfs_noversion'
BUILDTAGS+=' btrfs_version'
fi

# test whether "libdevmapper.h" is new enough to support deferred remove
# functionality.
if \
command -v gcc &> /dev/null \
&& ! ( echo -e '#include <libdevmapper.h>\nint main() { dm_task_deferred_remove(NULL); }'| gcc -xc - -o /dev/null -ldevmapper &> /dev/null ) \
&& ( echo -e '#include <libdevmapper.h>\nint main() { dm_task_deferred_remove(NULL); }'| gcc -xc - -o /dev/null -ldevmapper &> /dev/null ) \
; then
BUILDTAGS+=' libdm_no_deferred_remove'
BUILDTAGS+=' libdm_deferred_remove'
fi

# Use these flags when compiling the tests and final binary
Expand Down
2 changes: 1 addition & 1 deletion pkg/devicemapper/devmapper_wrapper_deferred_remove.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// +build linux,!libdm_no_deferred_remove
// +build linux,libdm_deferred_remove

package devicemapper

Expand Down
4 changes: 2 additions & 2 deletions pkg/devicemapper/devmapper_wrapper_no_deferred_remove.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
// +build linux,libdm_no_deferred_remove
// +build linux,!libdm_deferred_remove

package devicemapper

// LibraryDeferredRemovalsupport is not supported when statically linked.
// LibraryDeferredRemovalSupport is not supported when statically linked.
const LibraryDeferredRemovalSupport = false

func dmTaskDeferredRemoveFct(task *cdmTask) int {
Expand Down