From a6b73dbc733abee71c1df28836b04d8b6c4f4f18 Mon Sep 17 00:00:00 2001
From: Matthew Heon <mheon@redhat.com>
Date: Thu, 13 Aug 2015 11:49:42 -0400
Subject: [PATCH] Remove Seccomp build tag to fix godep

Signed-off-by: Matthew Heon <mheon@redhat.com>
---
 Godeps/Godeps.json                          | 8 ++++----
 Makefile                                    | 5 ++---
 libcontainer/integration/seccomp_test.go    | 2 +-
 libcontainer/seccomp/seccomp_linux.go       | 2 +-
 libcontainer/seccomp/seccomp_unsupported.go | 2 +-
 5 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
index cd4f13508..832ef449f 100644
--- a/Godeps/Godeps.json
+++ b/Godeps/Godeps.json
@@ -55,13 +55,13 @@
 			"ImportPath": "github.com/opencontainers/specs",
 			"Rev": "5b31bb2b7771e5074a4eb14eca432da1ca5182d6"
 		},
-		{
-			"ImportPath": "github.com/syndtr/gocapability/capability",
-			"Rev": "e55e5833692b49e49a0073ad5baf7803f21bebf4"
-		},
 		{
 			"ImportPath": "github.com/seccomp/libseccomp-golang",
 			"Rev": "1b506fc7c24eec5a3693cdcbed40d9c226cfc6a1"
+		},
+		{
+			"ImportPath": "github.com/syndtr/gocapability/capability",
+			"Rev": "e55e5833692b49e49a0073ad5baf7803f21bebf4"
 		}
 	]
 }
diff --git a/Makefile b/Makefile
index bd5dd88a2..09d28f28b 100644
--- a/Makefile
+++ b/Makefile
@@ -1,11 +1,10 @@
 RUNC_TEST_IMAGE=runc_test
 PROJECT=github.com/opencontainers/runc
 TEST_DOCKERFILE=script/test_Dockerfile
-BUILD_TAGS=seccomp
 export GOPATH:=$(CURDIR)/Godeps/_workspace:$(GOPATH)
 
 all:
-	go build -tags $(BUILD_TAGS) -o runc .
+	go build -o runc .
 
 vet:
 	go get golang.org/x/tools/cmd/vet
@@ -21,7 +20,7 @@ test: runctestimage
 	docker run -e TESTFLAGS --privileged --rm -v $(CURDIR):/go/src/$(PROJECT) $(RUNC_TEST_IMAGE) make localtest
 
 localtest:
-	go test -tags $(BUILD_TAGS) $(TESTFLAGS) -v ./...
+	go test ${TESTFLAGS} -v ./...
 
 install:
 	cp runc /usr/local/bin/runc
diff --git a/libcontainer/integration/seccomp_test.go b/libcontainer/integration/seccomp_test.go
index 781de48de..726656975 100644
--- a/libcontainer/integration/seccomp_test.go
+++ b/libcontainer/integration/seccomp_test.go
@@ -1,4 +1,4 @@
-// +build seccomp,linux,cgo
+// +build linux,cgo
 
 package integration
 
diff --git a/libcontainer/seccomp/seccomp_linux.go b/libcontainer/seccomp/seccomp_linux.go
index 58bdbf6d6..4d12c4a1b 100644
--- a/libcontainer/seccomp/seccomp_linux.go
+++ b/libcontainer/seccomp/seccomp_linux.go
@@ -1,4 +1,4 @@
-// +build linux,cgo,seccomp
+// +build linux,cgo
 
 package seccomp
 
diff --git a/libcontainer/seccomp/seccomp_unsupported.go b/libcontainer/seccomp/seccomp_unsupported.go
index 790d3b5a4..712ad253d 100644
--- a/libcontainer/seccomp/seccomp_unsupported.go
+++ b/libcontainer/seccomp/seccomp_unsupported.go
@@ -1,4 +1,4 @@
-// +build !linux !cgo !seccomp
+// +build !linux !cgo
 
 package seccomp