33364 - test for ARM in config/Linux.mk is too specific

Status: RESOLVED FIXED

(NSPR :: NSPR, defect, P3)

Description

[pb]

This patch allows ARM systems other than v4l and SA110 to be correctly detected.

Index: Linux.mk
===================================================================
RCS file: /cvsroot/mozilla/nsprpub/config/Linux.mk,v
retrieving revision 3.16.2.1
diff -u -p -r3.16.2.1 Linux.mk
--- Linux.mk	2000/03/08 16:24:48	3.16.2.1
+++ Linux.mk	2000/03/26 12:45:42
@@ -50,7 +50,7 @@ endif
 ifeq (86,$(findstring 86,$(OS_TEST)))
 CPU_ARCH		:= x86
 else
-ifeq (,$(filter-out armv4l sa110,$(OS_TEST)))
+ifeq (,$(filter-out arm% sa110,$(OS_TEST)))
 CPU_ARCH		:= arm
 else
 CPU_ARCH		:= $(OS_TEST)

Comment 1

[Wan-Teh Chang]

Thanks for the bug report.  Before I check in
your patch, I need to ask you a question.  We
are going to change the license terms of NSPR
to dual MPL/GPL.  Would you let us distribute
your patch under MPL/GPL?

Comment 2

[pb]

Yes, that's fine.

Comment 3

[Wan-Teh Chang]

I'm just curious -- what does 'uname -a' return on
your system?

Comment 4

[Wan-Teh Chang]

Checked in the patch on the main trunk.
/cvsroot/mozilla/nsprpub/config/Linux.mk, revision 3.18

Checked in the patch on the NSPRPUB_RELEASE_4_0_BRANCH.
/cvsroot/mozilla/nsprpub/config/Linux.mk, revision 3.15.8.3

Will check it in on the NSPRPUB_CLIENT_BRANCH (which the
mozilla client pulls) when the mozilla tree reopens.

Comment 5

[Wan-Teh Chang]

Checked in the patch on the NSPRPUB_CLIENT_BRANCH.
/cvsroot/mozilla/nsprpub/config/Linux.mk, revision 3.16.2.2