Buildroot Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Yann E. MORIN <yann.morin.1998@free.fr>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH 3/3] package/qpid-proton: fix build without C++
Date: Fri, 2 Apr 2021 23:54:50 +0200	[thread overview]
Message-ID: <20210402215450.GM24043@scaer> (raw)
In-Reply-To: <20210402163343.1254491-3-fontaine.fabrice@gmail.com>

Fabrice, All,

On 2021-04-02 18:33 +0200, Fabrice Fontaine spake thusly:
> Fixes:
>  - http://autobuild.buildroot.org/results/05f344151100219c159ca4d466a453df96bf07fa
> 
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>

Applied to master, with the following changes:

  - move code in thread condition, to avoid setting -DBUILD_CPP twice

Thanks!

Regards,
Yann E. MORIN.

> ---
>  package/qpid-proton/qpid-proton.mk | 6 ++++++
>  1 file changed, 6 insertions(+)
> 
> diff --git a/package/qpid-proton/qpid-proton.mk b/package/qpid-proton/qpid-proton.mk
> index bbf953c472..ce1f0af773 100644
> --- a/package/qpid-proton/qpid-proton.mk
> +++ b/package/qpid-proton/qpid-proton.mk
> @@ -31,6 +31,12 @@ QPID_PROTON_CONF_OPTS = \
>  	-DENABLE_WARNING_ERROR=OFF \
>  	-DPYTHON_EXECUTABLE=$(HOST_DIR)/bin/python2
>  
> +ifeq ($(BR2_INSTALL_LIBSTDCPP),y)
> +QPID_PROTON_CONF_OPTS += -DBUILD_CPP=ON
> +else
> +QPID_PROTON_CONF_OPTS += -DBUILD_CPP=OFF
> +endif
> +
>  # epoll proactor unconditionally uses pthread and cpp binding unconditionally
>  # uses proactor
>  ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),)
> -- 
> 2.30.2
> 
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'

  reply	other threads:[~2021-04-02 21:54 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-04-02 16:33 [Buildroot] [PATCH 1/3] package/qpid-proton: fix build without threads Fabrice Fontaine
2021-04-02 16:33 ` [Buildroot] [PATCH 2/3] package/pkg-cmake.mk: don't unconditionally set CMAKE_CXX_COMPILER Fabrice Fontaine
2021-04-02 21:52   ` Yann E. MORIN
2021-04-04  9:27   ` Peter Korsgaard
2021-04-02 16:33 ` [Buildroot] [PATCH 3/3] package/qpid-proton: fix build without C++ Fabrice Fontaine
2021-04-02 21:54   ` Yann E. MORIN [this message]
2021-04-02 21:54 ` [Buildroot] [PATCH 1/3] package/qpid-proton: fix build without threads Yann E. MORIN

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=20210402215450.GM24043@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