On Wed, Feb 27, 2019 at 09:33:12AM +0100, Thomas Monjalon wrote:
> 26/02/2019 18:49, Luca Boccassi:
> > On Tue, 2019-02-26 at 17:46 +0000, luca.bocca...@gmail.com wrote:
> > > From: Luca Boccassi <luca.bocca...@microsoft.com>
> > > 
> > > pcap has historically shipped a custom pcap-config binary tool which
> > > does the job of pkg-config. It was never compatible with cross
> > > compilation.
> > > Meson uses it when using dependency(), which then means cross
> > > compilation fails.
> > > Set pcap-config to empty in the meson cross compilation files so
> > > that Meson will not use it, and add a fallback in case
> > > dependency() fails.
> > > libpcap 1.9.0 finally ships a pkg-config file so everything will
> > > work out of the box in the future.
> > > 
> > > Signed-off-by: Luca Boccassi <luca.bocca...@microsoft.com>
> > > ---
> > > v8: added back pcap change separately. Tested with bootlin
> > >     cross-compilation toolchain, everything seems to work.
> > 
> > I had some time to invest so I added back this change, in a way that
> > works with cross compilation too. Given the series wasn't merged yet
> > and there was a conflict I've done a v8 rather than a single separate
> > patch, but it's independent from the rest.
> > 
> > More testing is of course welcome!
> 
> I still see the same error when cross-compiling:
> 
> /usr/include/stdint.h:109: error: "__INT64_C" redefined
> 
Can patches 1-5 be merged anyway, leaving 6 for later?
/Bruce

Reply via email to