don't check whether USE_64 is defined but whether it is 0 or not
--- mozilla/security/nss/lib/freebl/Makefile 2010-01-29 00:10:07.000000000 +0
100
+++ Makefile 2010-08-25 13:29:14.000000000 +0200
@@ -66,7 +66,7 @@
# unset this on those that have multiple freebl libraries
FREEBL_BUILD_SINGLE_SHLIB = 1
-ifdef USE_64
+ifneq ($(USE_64),0)
DEFINES += -DNSS_USE_64
endif
@@ -82,7 +82,7 @@
# NSS_X86_OR_X64 means the target is either x86 or x64
ifeq (,$(filter-out x386 x86 x86_64,$(CPU_ARCH)))
DEFINES += -DNSS_X86_OR_X64
-ifdef USE_64
+ifneq ($(USE_64),0)
DEFINES += -DNSS_X64
else
DEFINES += -DNSS_X86
@@ -103,7 +103,7 @@
endif
ifeq (,$(filter-out WINNT WIN95,$(OS_TARGET))) #omits WINCE
-ifndef USE_64
+ifeq ($(USE_64),0)
# 32-bit Windows
ifdef NS_USE_GCC
# Ideally, we want to use assembler
@@ -179,7 +179,7 @@
ifeq ($(OS_TARGET),AIX)
DEFINES += -DMP_USE_UINT_DIGIT
- ifndef USE_64
+ ifeq ($(USE_64),0)
DEFINES += -DMP_NO_DIV_WORD -DMP_NO_ADD_WORD -DMP_NO_SUB_WORD
endif
endif # AIX
@@ -188,7 +188,7 @@
ifneq ($(OS_TEST), ia64)
# PA-RISC
ASFILES += ret_cr16.s
-ifndef USE_64
+ifeq ($(USE_64),0)
FREEBL_BUILD_SINGLE_SHLIB =
HAVE_ABI32_INT32 = 1
HAVE_ABI32_FPU = 1
@@ -199,7 +199,7 @@
DEFINES += -DMP_USE_UINT_DIGIT -DMP_NO_MP_WORD
DEFINES += -DSHA_NO_LONG_LONG # avoid 64-bit arithmetic in SHA512
else
-ifdef USE_64
+ifneq ($(USE_64),0)
# this builds for DA2.0W (HP PA 2.0 Wide), the LP64 ABI, using 64-bit digits
MPI_SRCS += mpi_hp.c
ASFILES += hpma512.s hppa20.s
@@ -247,7 +247,7 @@
# We always use Sun's assembler, which uses Sun's naming convention.
ifeq ($(CPU_ARCH),sparc)
FREEBL_BUILD_SINGLE_SHLIB=
- ifdef USE_64
+ ifneq ($(USE_64),0)
HAVE_ABI64_INT = 1
HAVE_ABI64_FPU = 1
else