snap-seccomp: statically link embedded libseccomp

mvo5 · Jul 10, 2017 · f77a386 · f77a386
1 parent e6f0b9b
commit f77a386
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 0 deletions.
diff --git a/cmd/snap-seccomp/main.go b/cmd/snap-seccomp/main.go
@@ -19,6 +19,8 @@
 
 package main
 
+//#cgo LDFLAGS: ${SRCDIR}/libseccomp.upstream/src/.libs/libseccomp.a
+//
 //#include <asm/ioctls.h>
 //#include <ctype.h>
 //#include <errno.h>
@@ -133,6 +135,8 @@ package main
 //
 import "C"
 
+//go:generate sh -c "(cd libseccomp.upstream ; ./autogen.sh ; ./configure; make)"
+
 import (
 	"bufio"
 	"bytes"

diff --git a/packaging/ubuntu-14.04/rules b/packaging/ubuntu-14.04/rules
@@ -98,6 +98,7 @@ override_dh_auto_build:
 	# Build golang bits
 	mkdir -p _build/src/$(DH_GOPKG)/cmd/snap/test-data
 	cp -a cmd/snap/test-data/*.gpg _build/src/$(DH_GOPKG)/cmd/snap/test-data/
+	cp -a cmd/snap-seccomp/libseccomp.upstream/* _build/src/$(DH_GOPKG)/cmd/snap-seccomp/libseccomp.upstream
 	dh_auto_build -- $(BUILDFLAGS) $(TAGS) $(GCCGOFLAGS)
 	# Build C bits, sadly manually
 	cd cmd && ( autoreconf -i -f )

diff --git a/packaging/ubuntu-16.04/rules b/packaging/ubuntu-16.04/rules
@@ -105,6 +105,7 @@ override_dh_auto_build:
 	# Build golang bits
 	mkdir -p _build/src/$(DH_GOPKG)/cmd/snap/test-data
 	cp -a cmd/snap/test-data/*.gpg _build/src/$(DH_GOPKG)/cmd/snap/test-data/
+	cp -a cmd/snap-seccomp/libseccomp.upstream/* _build/src/$(DH_GOPKG)/cmd/snap-seccomp/libseccomp.upstream
 	dh_auto_build -- $(BUILDFLAGS) $(TAGS) $(GCCGOFLAGS)
 	# Build C bits, sadly manually
 	cd cmd && ( autoreconf -i -f )