From: Peter Korsgaard <peter@korsgaard.com>
To: buildroot@busybox.net
Subject: [Buildroot] [git commit] libnspr: use __nios2__ instead of nios2
Date: Mon, 24 Apr 2017 21:15:39 +0200 [thread overview]
Message-ID: <87a875zkf8.fsf@dell.be.48ers.dk> (raw)
In-Reply-To: <20170406141359.88F768271B@busybox.osuosl.org> (Thomas Petazzoni's message of "Thu, 6 Apr 2017 16:13:52 +0200")
>>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@free-electrons.com> writes:
> commit: https://git.buildroot.net/buildroot/commit/?id=9a521546ed553d2be23740bbf1a7aa05bce9eb09
> branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master
> Our patch adding nios2 support to libnspr uses the built-in compiler
> define "nios2". However, this doesn't work with C++11, where only the
> __nios2__ define is available. Since __nios2__ is always available,
> use that instead:
> $ ./output/host/usr/bin/nios2-linux-gcc -dM -E - < /dev/null | grep -E "( nios2 | __nios2__ )"
> $ ./output/host/usr/bin/nios2-linux-gcc -std=c++11 -x c++ -dM -E - < /dev/null | grep -E "( nios2 | __nios2__ )"
> Patch 0001-nios2.patch is therefore changed to use __nios2__ (the rest
> of the change noise is due to using quilt to format the patch). Patch
> 0002-microblaze.patch is simply updated to apply correctly on top of
> the modified 0001-nios2.patch.
> This fixes the build of the poppler library on nios2. It is built with
> -std=c++11, and includes nspr headers (through nss), causing a build
> issue.
> Fixes:
> http://autobuild.buildroot.net/results/9fee58076157d814616fa0da51afde8da21a8973/
> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Committed to 2017.02.x, thanks.
--
Bye, Peter Korsgaard
prev parent reply other threads:[~2017-04-24 19:15 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-04-06 14:13 [Buildroot] [git commit] libnspr: use __nios2__ instead of nios2 Thomas Petazzoni
2017-04-24 19:15 ` Peter Korsgaard [this message]
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=87a875zkf8.fsf@dell.be.48ers.dk \
--to=peter@korsgaard.com \
--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