Skip to content

Disable cgo-requiring bits when cgo is not enabled #410

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

Merged
rhatdan merged 1 commit into from
Aug 6, 2019
Merged

Disable cgo-requiring bits when cgo is not enabled #410

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 Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ PACKAGE := github.com/containers/storage
GIT_BRANCH := $(shell git rev-parse --abbrev-ref HEAD 2>/dev/null)
GIT_BRANCH_CLEAN := $(shell echo $(GIT_BRANCH) | sed -e "s/[^[:alnum:]]/-/g")
EPOCH_TEST_COMMIT := 0418ebf59f9e1f564831c0ba9378b7f8e40a1c73
NATIVETAGS := exclude_graphdriver_devicemapper exclude_graphdriver_btrfs exclude_graphdriver_overlay
NATIVETAGS :=
AUTOTAGS := $(shell ./hack/btrfs_tag.sh) $(shell ./hack/libdm_tag.sh) $(shell ./hack/ostree_tag.sh)
BUILDFLAGS := -tags "$(AUTOTAGS) $(TAGS)" $(FLAGS)
GO ?= go
Expand Down
2 changes: 1 addition & 1 deletion drivers/btrfs/btrfs.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// +build linux
// +build linux,cgo

package btrfs

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

package btrfs

Expand Down
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_noversion,cgo

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_noversion !cgo

package btrfs

Expand Down
2 changes: 2 additions & 0 deletions drivers/devmapper/device_setup.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
// +build linux,cgo

package devmapper

import (
Expand Down
2 changes: 1 addition & 1 deletion drivers/devmapper/deviceset.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// +build linux
// +build linux,cgo

package devmapper

Expand Down
2 changes: 2 additions & 0 deletions drivers/devmapper/devmapper_doc.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
// +build linux,cgo

package devmapper

// Definition of struct dm_task and sub structures (from lvm2)
Expand Down
2 changes: 1 addition & 1 deletion drivers/devmapper/devmapper_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// +build linux
// +build linux,cgo

package devmapper

Expand Down
2 changes: 1 addition & 1 deletion drivers/devmapper/driver.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// +build linux
// +build linux,cgo

package devmapper

Expand Down
2 changes: 1 addition & 1 deletion drivers/devmapper/mount.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// +build linux
// +build linux,cgo

package devmapper

Expand Down
2 changes: 1 addition & 1 deletion drivers/quota/projectquota.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// +build linux,!exclude_disk_quota
// +build linux,!exclude_disk_quota,cgo

//
// projectquota.go - implements XFS project quota controls
Expand Down
2 changes: 1 addition & 1 deletion drivers/quota/projectquota_unsupported.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// +build linux,exclude_disk_quota
// +build !linux exclude_disk_quota !cgo

package quota

Expand Down
2 changes: 1 addition & 1 deletion drivers/register/register_devicemapper.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// +build !exclude_graphdriver_devicemapper,linux
// +build !exclude_graphdriver_devicemapper,linux,cgo

package register

Expand Down
2 changes: 1 addition & 1 deletion drivers/register/register_overlay.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// +build !exclude_graphdriver_overlay,linux
// +build !exclude_graphdriver_overlay,linux,cgo

package register

Expand Down
13 changes: 10 additions & 3 deletions hack/btrfs_tag.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,16 @@
if test $(${GO:-go} env GOOS) != "linux" ; then
exit 0
fi
cc -E - > /dev/null 2> /dev/null << EOF
#include <btrfs/version.h>
cc -E - > /dev/null 2> /dev/null <<- EOF
#include <btrfs/ioctl.h>
EOF
if test $? -ne 0 ; then
echo btrfs_noversion
echo exclude_graphdriver_btrfs
else
cc -E - > /dev/null 2> /dev/null <<- EOF
#include <btrfs/version.h>
EOF
if test $? -ne 0 ; then
echo btrfs_noversion
fi
fi
2 changes: 1 addition & 1 deletion pkg/loopback/attach_loopback.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// +build linux
// +build linux,cgo

package loopback

Expand Down
2 changes: 1 addition & 1 deletion pkg/loopback/ioctl.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// +build linux
// +build linux,cgo

package loopback

Expand Down
2 changes: 1 addition & 1 deletion pkg/loopback/loop_wrapper.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// +build linux
// +build linux,cgo

package loopback

Expand Down
2 changes: 1 addition & 1 deletion pkg/loopback/loopback.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// +build linux
// +build linux,cgo

package loopback

Expand Down
1 change: 1 addition & 0 deletions pkg/loopback/loopback_unsupported.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
package loopback
2 changes: 1 addition & 1 deletion pkg/ostree/no_ostree.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// +build !ostree
// +build !ostree !cgo

package ostree

Expand Down
2 changes: 1 addition & 1 deletion pkg/ostree/ostree.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// +build ostree
// +build ostree,cgo

package ostree

Expand Down