[gnome-continuous] Add patch to disable bluez docs, update manifest for it
- From: Colin Walters <walters src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-continuous] Add patch to disable bluez docs, update manifest for it
- Date: Sat, 12 Jul 2014 21:07:41 +0000 (UTC)
commit 6252bc79552fa7b041ef5fdd7cde982023571b35
Author: Colin Walters <walters verbum org>
Date: Sat Jul 12 17:06:07 2014 -0400
Add patch to disable bluez docs, update manifest for it
manifest.json | 4 +-
patches/bluez-disable-docs.patch | 47 ++++++++++++++++++++++++++++++++++++++
2 files changed, 49 insertions(+), 2 deletions(-)
---
diff --git a/manifest.json b/manifest.json
index 519a9ca..1f17a8f 100644
--- a/manifest.json
+++ b/manifest.json
@@ -449,8 +449,8 @@
"/runtime/usr/lib/polkit-1/polkit-agent-helper-1"]},
{"src": "git:git://git.kernel.org/pub/scm/bluetooth/bluez.git",
- "config-opts": ["--disable-cups", "--disable-obex", "--disable-usb", "--disable-tools"],
- "patches": ["bluez-autogen.patch"]},
+ "config-opts": ["--disable-cups", "--disable-obex", "--disable-usb", "--disable-tools",
"--disable-manpages"],
+ "patches": ["bluez-autogen.patch", "bluez-disable-docs.patch"]},
{"src": "git:git://github.com/jpirko/libndp.git"},
diff --git a/patches/bluez-disable-docs.patch b/patches/bluez-disable-docs.patch
new file mode 100644
index 0000000..4b5825b
--- /dev/null
+++ b/patches/bluez-disable-docs.patch
@@ -0,0 +1,47 @@
+From ebb6e620dd3aff13e898032af2e9494f8106e3d2 Mon Sep 17 00:00:00 2001
+From: Colin Walters <walters verbum org>
+Date: Sat, 12 Jul 2014 17:02:19 -0400
+Subject: [PATCH 2/2] build-sys: Add --disable-manpages option
+
+Some systems won't have documentation build tools, or won't want docs
+on the target system. This option allows both to disable them.
+
+Matches code from systemd.
+---
+ Makefile.am | 2 ++
+ configure.ac | 5 +++++
+ 2 files changed, 7 insertions(+)
+
+diff --git a/Makefile.am b/Makefile.am
+index 2f05ceb..eca194e 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -369,7 +369,9 @@ endif
+
+ manual_pages = doc/btmon.1
+
++if ENABLE_MANPAGES
+ dist_man_MANS += $(manual_pages)
++endif
+
+ EXTRA_DIST += $(manual_pages:.1=.txt)
+
+diff --git a/configure.ac b/configure.ac
+index 9a7ab47..176eea8 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -174,6 +174,11 @@ if (test "${enable_client}" != "no"); then
+ fi
+ AM_CONDITIONAL(READLINE, test "${enable_readline}" = "yes")
+
++have_manpages=no
++AC_ARG_ENABLE(manpages, AS_HELP_STRING([--disable-manpages], [disable manpages]))
++AS_IF([test "x$enable_manpages" != xno], [have_manpages=yes])
++AM_CONDITIONAL(ENABLE_MANPAGES, [test "x$have_manpages" = "xyes"])
++
+ AC_ARG_ENABLE(systemd, AC_HELP_STRING([--disable-systemd],
+ [disable systemd integration]), [enable_systemd=${enableval}])
+ AM_CONDITIONAL(SYSTEMD, test "${enable_systemd}" != "no")
+--
+1.8.3.1
+
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]