1311919 - Make detect_host_arch legal

Status: RESOLVED FIXED

(NSS :: Build, defect)

Description

[Franziskus Kiefer [:franziskus]]

detect_host_arch.py requires a BSD license that's not actually there. This either needs the license file, a changed comment, or a rewrite to not requiring the license.
I should've noted that in the original review of bug 1237872.

Comment 1

[(not currently active) Ted Mielczarek]

Oh, oops. I could just rewrite it from scratch, I suppose, it's not terribly complicated.

Comment 2

[(not currently active) Ted Mielczarek]

Attachment: rewrite detect_host_arch

I rewrote the script from scratch. I dropped the bit that forced the host arch to be 'ia32' on Windows.

Comment 3

[Franziskus Kiefer [:franziskus]]

Comment on attachment 8807512 [details] [diff] [review]
rewrite detect_host_arch

Review of attachment 8807512 [details] [diff] [review]:
-----------------------------------------------------------------

::: coreconf/detect_host_arch.py
@@ +1,1 @@
>  #!/usr/bin/env python

could we make this python2? Or make the script python3 compatible.

Comment 4

[(not currently active) Ted Mielczarek]

https://hg.mozilla.org/projects/nss/rev/cdfa1ae89c52f6f3f3f78e5c1d4d1432849b2c4c
bug 1311919 - rewrite detect_host_arch. r=franziskus

Comment 5

[(not currently active) Ted Mielczarek]

I made a tiny change to make the script Python 3 compatible.

Comment 6

[Mike Hommey [:glandium]]

Comment on attachment 8807512 [details] [diff] [review]
rewrite detect_host_arch

Review of attachment 8807512 [details] [diff] [review]:
-----------------------------------------------------------------

::: coreconf/detect_host_arch.py
@@ +12,5 @@
> +    host_arch = platform.machine().lower()
> +    if host_arch in ('amd64', 'x86_64'):
> +        host_arch = 'x64'
> +    elif fnmatch.fnmatch(host_arch, 'i?86') or host_arch == 'i86pc':
> +        host_arch = 'x64'

This most probably broke building on 32-bits intel CPUs.

Comment 7

[(not currently active) Ted Mielczarek]

(In reply to Mike Hommey [:glandium] from comment #6)
> This most probably broke building on 32-bits intel CPUs.

You were right, Jan fixed it in bug 1321287.