From: Yann E. MORIN <yann.morin.1998@free.fr>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH 1/1] Fix build of lttng-libust
Date: Sun, 5 Nov 2017 22:10:39 +0100 [thread overview]
Message-ID: <20171105211039.GA10472@scaer> (raw)
In-Reply-To: <CAB4xu_0eaJgvj1dvixdnOSj8c1eO2cpXmo1m2sHp+FasXkuWYQ@mail.gmail.com>
Philippe, All,
On 2017-11-05 14:55 -0500, Philippe Proulx spake thusly:
> On Sun, Nov 5, 2017 at 11:31 AM, Yann E. MORIN <yann.morin.1998@free.fr> wrote:
[--SNIP--]
> > But I digress, and I think a better fix would indeed be to teach
> > configure.ac and Makefile.am to disable building the examples.
> I'll have a look at what we can do upstream for this.
Here is a very quick-n-dirty patch against your master, that should do
the trick (but is totally untested). Feel free to use it as-is if you
like it.
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
diff --git a/configure.ac b/configure.ac
index ca1de874..adbd8f90 100644
--- a/configure.ac
+++ b/configure.ac
@@ -468,6 +468,19 @@ they will not be installed.
AM_CONDITIONAL([MAN_PAGES_OPT], [test "x$man_pages_opt" != "xno"])
AM_CONDITIONAL([HAVE_ASCIIDOC_XMLTO], [test "x$have_asciidoc_xmlto" = "xyes"])
+# Do we want to build example?
+AC_ARG_ENABLE(
+examples,
+AS_HELP_STRING(
+[--d isable-examples],
+[Do not build examples]
+),
+[examples_opt=$enab leval],
+[examples_opt=yes]
+)
+
+AM_CONDITIONAL([EXAMPLES_OPT], [test "x$examples_opt" != "xno"])
+
# Default values
AC_DEFUN([_AC_DEFINE_AND_SUBST], [
AC_DEFINE_UNQUOTED([CONFIG_$1], [$2], [$1])
diff --git a/doc/Makefile.am b/doc/Makefile.am
index e110ed85..82689c5c 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,3 +1,7 @@
-SUBDIRS = . man examples
+if EXAMPLES_OPT
+EXAMPLES_SUBDIRS = examples
+endif
+
+SUBDIRS = . man $(EXAMPLES_SUBDIRS)
dist_doc_DATA = java-agent.txt
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
next prev parent reply other threads:[~2017-11-05 21:10 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-10-30 16:31 [Buildroot] [PATCH 1/1] Fix build of lttng-libust Norbert Lange
2017-10-30 19:40 ` Thomas Petazzoni
2017-10-31 10:20 ` Norbert Lange
2017-11-05 16:13 ` Arnout Vandecappelle
2017-11-05 16:31 ` Yann E. MORIN
2017-11-05 19:55 ` Philippe Proulx
2017-11-05 21:10 ` Yann E. MORIN [this message]
2017-11-05 21:20 ` Yann E. MORIN
2017-11-05 20:36 ` Norbert Lange
2017-11-05 22:02 ` Arnout Vandecappelle
2017-11-06 21:06 ` Philippe Proulx
2017-11-06 21:12 ` Thomas Petazzoni
2017-11-06 21:41 ` Philippe Proulx
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20171105211039.GA10472@scaer \
--to=yann.morin.1998@free.fr \
--cc=buildroot@busybox.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox