Bug#810579: nss: FTCBFS: defines LINUX based on uname

[Steven Chamberlain]

Helmut Grohne wrote:
> [...] However specifying that macro still makes "#if
> defined(LINUX)" succeed despite __linux__ not being defined. Given that
> the present patch does not work, I am removing the patch tag. Please add
> it back if you add another patch.

Thanks Helmut, sorry about that!  I didn't have the patch applied
properly when I tested on kfreebsd, or this would have been obvious.

> I very much like your approach of using __linux__ as it makes the build
> more robust, but I fear that this will require textually replacing LINUX
> with __linux__ in the source rather than using a macro indirection.

This is my preference too.  If nss would use the standard (since <=
2001?) __linux__ macro, it would not need to define its own via CFLAGS.
I've created a patch for this, which I hope could be accepted upstream.
Then I refreshed 38_kbsd.patch on top of it (attached also).

I've checked that this change is a no-op for native builds - diffoscope
confirms the compiled code on linux-amd64 and kfreebsd-amd64 is
unchanged by this.  And I reviewed the build logs to double-check I
really had the patches applied this time.

I don't have a linux->kfreebsd cross-build environment to confirm it has
fixed the FTCBFS, but perhaps Helmut could test that?

Thank you,
Regards,
-- 
Steven Chamberlain
steven at pyro.eu.org
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 10_linux.patch
Type: text/x-diff
Size: 6972 bytes
Desc: not available
URL: <http://lists.alioth.debian.org/pipermail/pkg-mozilla-maintainers/attachments/20160112/b9a371c6/attachment-0002.patch>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 38_kbsd.patch
Type: text/x-diff
Size: 3650 bytes
Desc: not available
URL: <http://lists.alioth.debian.org/pipermail/pkg-mozilla-maintainers/attachments/20160112/b9a371c6/attachment-0003.patch>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 473 bytes
Desc: Digital signature
URL: <http://lists.alioth.debian.org/pipermail/pkg-mozilla-maintainers/attachments/20160112/b9a371c6/attachment-0001.sig>