[gnome-continuous] manifest: Readd libseecomp with a build patch, untag xdg-app



commit f366ad4a74ceb61ca2910bc0234d5015f34c9290
Author: Colin Walters <walters verbum org>
Date:   Tue Jun 2 09:40:34 2015 -0400

    manifest: Readd libseecomp with a build patch, untag xdg-app

 manifest.json                     |    7 +++--
 patches/libseccomp-builddir.patch |   39 +++++++++++++++++++++++++++++++++++++
 2 files changed, 43 insertions(+), 3 deletions(-)
---
diff --git a/manifest.json b/manifest.json
index 30a0f12..f4e8a6b 100644
--- a/manifest.json
+++ b/manifest.json
@@ -874,12 +874,13 @@
                                 "--with-dracut",
                                 "--enable-installed-tests"]},
 
+               {"src": "git:git://github.com/seccomp/libseccomp",
+                "patches": ["libseccomp-builddir.patch"]},
+
                 {"src": "git:git://github.com/alexlarsson/xdg-app",
                  "config-opts": ["--disable-documentation",
                                  "--with-priv-mode=none"],
-                 "setuid": ["/runtime/usr/bin/xdg-app-helper"],
-                 "tag": "811c512e5694ae583a3fbe483b497155bf766d62",
-                 "tag-reason": "needs libseccomp"},
+                 "setuid": ["/runtime/usr/bin/xdg-app-helper"]},
 
                {"src": "gnome:gnome-hwtest",
                  "component": "minimal",
diff --git a/patches/libseccomp-builddir.patch b/patches/libseccomp-builddir.patch
new file mode 100644
index 0000000..2e25ce6
--- /dev/null
+++ b/patches/libseccomp-builddir.patch
@@ -0,0 +1,39 @@
+From ae10a2c09a27b0fd33ffabbcdcf5bece776aa04a Mon Sep 17 00:00:00 2001
+From: Colin Walters <walters verbum org>
+Date: Tue, 2 Jun 2015 09:37:06 -0400
+Subject: [PATCH] build: Fix srcdir != builddir from git
+
+See https://github.com/cgwalters/build-api/blob/master/build-api.md
+---
+ src/Makefile.am   | 1 +
+ tools/Makefile.am | 2 ++
+ 2 files changed, 3 insertions(+)
+
+diff --git a/src/Makefile.am b/src/Makefile.am
+index d8fbd85..a14cefb 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -51,6 +51,7 @@ arch_syscall_dump_SOURCES = arch-syscall-dump.c ${SOURCES_ARCH}
+ arch_syscall_check_SOURCES = arch-syscall-check.c ${SOURCES_ARCH}
+ 
+ libseccomp_la_SOURCES = ${SOURCES_GEN} ${SOURCES_ARCH}
++libseccomp_la_CPPFLAGS = ${AM_CPPFLAGS} -I$(top_builddir)/include
+ libseccomp_la_CFLAGS = ${AM_CFLAGS} ${CFLAGS} -fPIC -DPIC -fvisibility=hidden
+ libseccomp_la_LDFLAGS = ${AM_LDFLAGS} ${LDFLAGS} \
+       -version-number ${VERSION_MAJOR}:${VERSION_MINOR}:${VERSION_MICRO}
+diff --git a/tools/Makefile.am b/tools/Makefile.am
+index 422b35d..b18dc9b 100644
+--- a/tools/Makefile.am
++++ b/tools/Makefile.am
+@@ -16,6 +16,8 @@
+ # along with this library; if not, see <http://www.gnu.org/licenses>.
+ #
+ 
++AM_CPPFLAGS = -I$(top_builddir)/include
++
+ noinst_LTLIBRARIES = util.la
+ util_la_SOURCES = util.c util.h bpf.h
+ util_la_LDFLAGS = -module
+-- 
+1.8.3.1
+


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]