2008-06-06 16:40:11 +04:00
|
|
|
#! gmake
|
|
|
|
#
|
2012-10-01 22:02:15 +04:00
|
|
|
# This Source Code Form is subject to the terms of the Mozilla Public
|
|
|
|
# License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
|
|
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
2008-06-06 16:40:11 +04:00
|
|
|
|
|
|
|
#######################################################################
|
|
|
|
# (1) Include initial platform-independent assignments (MANDATORY). #
|
|
|
|
#######################################################################
|
|
|
|
|
|
|
|
include manifest.mn
|
|
|
|
|
|
|
|
#######################################################################
|
|
|
|
# (2) Include "global" configuration information. (OPTIONAL) #
|
|
|
|
#######################################################################
|
|
|
|
|
|
|
|
include $(CORE_DEPTH)/coreconf/config.mk
|
|
|
|
|
|
|
|
#######################################################################
|
|
|
|
# (3) Include "component" configuration information. (OPTIONAL) #
|
|
|
|
#######################################################################
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
#######################################################################
|
|
|
|
# (4) Include "local" platform-dependent assignments (OPTIONAL). #
|
|
|
|
#######################################################################
|
|
|
|
|
2015-10-23 21:39:23 +03:00
|
|
|
ifdef NSS_DISABLE_GTESTS
|
2016-11-02 12:29:58 +03:00
|
|
|
DIRS := $(filter-out gtests,$(DIRS))
|
2017-06-13 15:26:51 +03:00
|
|
|
DIRS := $(filter-out cpputil,$(DIRS))
|
2015-10-23 21:39:23 +03:00
|
|
|
endif
|
2008-06-06 16:40:11 +04:00
|
|
|
|
|
|
|
#######################################################################
|
|
|
|
# (5) Execute "global" rules. (OPTIONAL) #
|
|
|
|
#######################################################################
|
|
|
|
|
|
|
|
include $(CORE_DEPTH)/coreconf/rules.mk
|
|
|
|
|
|
|
|
#######################################################################
|
|
|
|
# (6) Execute "component" rules. (OPTIONAL) #
|
|
|
|
#######################################################################
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
#######################################################################
|
|
|
|
# (7) Execute "local" rules. (OPTIONAL). #
|
|
|
|
#######################################################################
|
|
|
|
|
2016-11-16 16:06:23 +03:00
|
|
|
nss_build_all: build_nspr all latest
|
2008-06-06 16:40:11 +04:00
|
|
|
|
2013-04-30 03:21:02 +04:00
|
|
|
nss_clean_all: clobber_nspr clobber
|
2008-06-06 16:40:11 +04:00
|
|
|
|
2013-04-12 03:46:53 +04:00
|
|
|
NSPR_CONFIG_STATUS = $(CORE_DEPTH)/../nspr/$(OBJDIR_NAME)/config.status
|
|
|
|
NSPR_CONFIGURE = $(CORE_DEPTH)/../nspr/configure
|
2008-06-06 16:40:11 +04:00
|
|
|
|
|
|
|
#
|
|
|
|
# Translate coreconf build options to NSPR configure options.
|
|
|
|
#
|
|
|
|
|
2013-01-25 20:26:46 +04:00
|
|
|
ifeq ($(OS_TARGET),Android)
|
2015-10-23 21:39:23 +03:00
|
|
|
NSPR_CONFIGURE_OPTS += --with-android-ndk=$(ANDROID_NDK) \
|
|
|
|
--target=$(ANDROID_PREFIX) \
|
|
|
|
--with-android-version=$(OS_TARGET_RELEASE) \
|
|
|
|
--with-android-toolchain=$(ANDROID_TOOLCHAIN) \
|
|
|
|
--with-android-platform=$(ANDROID_SYSROOT)
|
2013-01-25 20:26:46 +04:00
|
|
|
endif
|
2008-06-06 16:40:11 +04:00
|
|
|
ifdef BUILD_OPT
|
|
|
|
NSPR_CONFIGURE_OPTS += --disable-debug --enable-optimize
|
|
|
|
endif
|
2014-03-10 06:40:25 +04:00
|
|
|
ifdef USE_X32
|
|
|
|
NSPR_CONFIGURE_OPTS += --enable-x32
|
|
|
|
endif
|
2008-06-06 16:40:11 +04:00
|
|
|
ifdef USE_64
|
|
|
|
NSPR_CONFIGURE_OPTS += --enable-64bit
|
|
|
|
endif
|
|
|
|
ifeq ($(OS_TARGET),WIN95)
|
|
|
|
NSPR_CONFIGURE_OPTS += --enable-win32-target=WIN95
|
|
|
|
endif
|
|
|
|
ifdef USE_DEBUG_RTL
|
|
|
|
NSPR_CONFIGURE_OPTS += --enable-debug-rtl
|
|
|
|
endif
|
2014-08-13 23:47:00 +04:00
|
|
|
ifdef USE_STATIC_RTL
|
|
|
|
NSPR_CONFIGURE_OPTS += --enable-static-rtl
|
|
|
|
endif
|
2008-06-06 16:40:11 +04:00
|
|
|
ifdef NS_USE_GCC
|
2016-04-12 15:40:44 +03:00
|
|
|
NSPR_CONFIGURE_ENV = CC=gcc CXX=g++
|
|
|
|
endif
|
2019-07-02 00:19:55 +03:00
|
|
|
# Make sure to remove -arch arguments. NSPR can't handle that.
|
|
|
|
remove_arch = $(filter-out __REMOVEME%,$(subst $(NULL) -arch , __REMOVEME,$(1)))
|
2016-10-15 09:45:05 +03:00
|
|
|
ifdef CC
|
2019-07-02 00:19:55 +03:00
|
|
|
NSPR_CONFIGURE_ENV = CC="$(call remove_arch,$(CC))"
|
2016-10-15 09:45:05 +03:00
|
|
|
endif
|
|
|
|
ifdef CCC
|
2019-07-02 00:19:55 +03:00
|
|
|
NSPR_CONFIGURE_ENV += CXX="$(call remove_arch,$(CCC))"
|
2016-10-15 09:45:05 +03:00
|
|
|
endif
|
2016-04-12 15:40:44 +03:00
|
|
|
|
2008-06-06 16:40:11 +04:00
|
|
|
#
|
|
|
|
# Some pwd commands on Windows (for example, the pwd
|
|
|
|
# command in Cygwin) return a pathname that begins
|
|
|
|
# with a (forward) slash. When such a pathname is
|
|
|
|
# passed to Windows build tools (for example, cl), it
|
|
|
|
# is mistaken as a command-line option. If that is the case,
|
|
|
|
# we use a relative pathname as NSPR's prefix on Windows.
|
|
|
|
#
|
|
|
|
|
|
|
|
USEABSPATH="YES"
|
|
|
|
ifeq (,$(filter-out WIN%,$(OS_TARGET)))
|
|
|
|
ifeq (,$(findstring :,$(shell pwd)))
|
|
|
|
USEABSPATH="NO"
|
|
|
|
endif
|
|
|
|
endif
|
|
|
|
ifeq ($(USEABSPATH),"YES")
|
2013-04-12 03:46:53 +04:00
|
|
|
NSPR_PREFIX = $(shell pwd)/../dist/$(OBJDIR_NAME)
|
2008-06-06 16:40:11 +04:00
|
|
|
else
|
|
|
|
NSPR_PREFIX = $$(topsrcdir)/../dist/$(OBJDIR_NAME)
|
|
|
|
endif
|
|
|
|
|
2016-11-07 08:01:08 +03:00
|
|
|
ifndef NSS_GYP_PREFIX
|
2008-06-06 16:40:11 +04:00
|
|
|
$(NSPR_CONFIG_STATUS): $(NSPR_CONFIGURE)
|
2013-04-30 03:21:02 +04:00
|
|
|
mkdir -p $(CORE_DEPTH)/../nspr/$(OBJDIR_NAME)
|
2013-04-12 03:46:53 +04:00
|
|
|
cd $(CORE_DEPTH)/../nspr/$(OBJDIR_NAME) ; \
|
2016-04-12 15:40:44 +03:00
|
|
|
$(NSPR_CONFIGURE_ENV) sh ../configure \
|
2008-06-06 16:40:11 +04:00
|
|
|
$(NSPR_CONFIGURE_OPTS) \
|
|
|
|
--with-dist-prefix='$(NSPR_PREFIX)' \
|
|
|
|
--with-dist-includedir='$(NSPR_PREFIX)/include'
|
2016-10-15 09:45:05 +03:00
|
|
|
else
|
|
|
|
$(NSPR_CONFIG_STATUS): $(NSPR_CONFIGURE)
|
|
|
|
mkdir -p $(CORE_DEPTH)/../nspr/$(OBJDIR_NAME)
|
|
|
|
cd $(CORE_DEPTH)/../nspr/$(OBJDIR_NAME) ; \
|
|
|
|
$(NSPR_CONFIGURE_ENV) sh ../configure \
|
|
|
|
$(NSPR_CONFIGURE_OPTS) \
|
2016-11-07 08:01:08 +03:00
|
|
|
--prefix='$(NSS_GYP_PREFIX)'
|
2016-10-15 09:45:05 +03:00
|
|
|
endif
|
2008-06-06 16:40:11 +04:00
|
|
|
|
|
|
|
build_nspr: $(NSPR_CONFIG_STATUS)
|
2013-04-12 03:46:53 +04:00
|
|
|
$(MAKE) -C $(CORE_DEPTH)/../nspr/$(OBJDIR_NAME)
|
Bug 1577822 - land NSS a3ee4f26b4c1 UPGRADE_NSS_RELEASE, r=kjacobs
2019-09-18 Kevin Jacobs <kjacobs@mozilla.com>
* cmd/lib/derprint.c:
Bug 1581024 - Check for pointer wrap in derprint.c. r=jcj
Check for pointer wrap on output-length check in the derdump
utility.
[a3ee4f26b4c1] [tip]
2019-09-18 Giulio Benetti <giulio.benetti@micronovasrl.com>
* lib/freebl/gcm-aarch64.c:
Bug 1580126 - Fix build failure on aarch64_be while building
freebl/gcm r=kjacobs
Build failure is caused by different #ifdef conditions in gcm.c and
gcm-aarch64.c that leads to double declaration of the same gcm_*
functions.
Fix #ifdef condition in gcm-aarch64.c making it the same as the one
in gcm.c.
Signed-off-by: Giulio Benetti <giulio.benetti@micronovasrl.com>
[fa0d958de0c3]
2019-09-17 Kai Engert <kaie@kuix.de>
* automation/taskcluster/graph/src/extend.js:
Bug 1385039 - Build NSPR tests as part of NSS continuous
integration. r=kjacobs
[cc97f1a93038]
2019-09-17 Landry Breuil <landry@openbsd.org>
* lib/freebl/Makefile:
Bug 1581391 - include gcm-aarch64 on all unices, not only linux
r=kjacobs
[e7b4f293fa4e]
2019-09-17 Martin Thomson <mt@lowentropy.net>
* mach:
Bug 1581041 - Rename mach-commands to mach-completion, r=jcj
This means that we can point our completion at the gecko one.
[bc91272fcbdc]
2019-09-16 Jenine <jenine_c@outlook.com>
* cmd/pk11importtest/pk11importtest.c, lib/softoken/pkcs11.c:
Bug 1558313 - Fix clang warnings in pk11importtest.c and pkcs11.c
r=marcusburghardt
[4569b745f74e]
2019-09-13 Daiki Ueno <dueno@redhat.com>
* lib/certhigh/certvfy.c:
Bug 1542207, fix policy check on signature algorithms, r=rrelyea
Reviewers: rrelyea
Reviewed By: rrelyea
Bug #: 1542207
[ed8a41d16c1c]
2019-09-05 Daiki Ueno <dueno@redhat.com>
* lib/freebl/drbg.c:
Bug 1560329, drbg: perform continuous test on entropy source,
r=rrelyea
Summary: FIPS 140-2 section 4.9.2 requires a conditional self test
to check that consecutive entropy blocks from the system are
different. As neither getentropy() nor /dev/urandom provides that
check on the output, this adds the self test at caller side.
Reviewers: rrelyea
Reviewed By: rrelyea
Bug #: 1560329
[c66dd879d16a]
2019-09-06 Martin Thomson <mt@lowentropy.net>
* automation/taskcluster/graph/src/queue.js:
Bug 1579290 - Disable LSAN during builds, r=ueno
Summary: See the bug description for details.
[f28f3d7b7cf0]
2019-09-13 Kai Engert <kaie@kuix.de>
* Makefile, build.sh, coreconf/nspr.sh, help.txt:
Bug 1385061 - Build NSPR tests with NSS make; Add gyp parameters to
build/run NSPR tests. r=jcj
[8b4a226f7d23]
2019-09-11 Kai Engert <kaie@kuix.de>
* nss.gyp:
Bug 1577359 - Build atob and btoa for Thunderbird. r=jcj
[1fe61aadaf57]
2019-09-10 Marcus Burghardt <mburghardt@mozilla.com>
* cmd/pk12util/pk12util.c:
Bug 1579036 - Define error when trying to export non-existent cert
with pk12util. r=jcj
[65ab97f03c89]
2019-09-04 Martin Thomson <mt@lowentropy.net>
* gtests/mozpkix_gtest/pkixder_input_tests.cpp:
Bug 1578626 - Remove undefined nullptr decrement, r=keeler
Summary: This uses uintptr_t to avoid the worst. It still looks
terrible and might trip static analysis warnings, but the
reinterpret_cast should hide that.
This assumes that sizeof(uintptr_t) == sizeof(void*), so I've added
an assertion so that we'll at least fail the test on those systems.
(We could use GTEST_SKIP instead, but we don't have that in the
version of gtest that we use.)
Reviewers: keeler
Tags: #secure-revision
Bug #: 1578626
[d2485b1c997e]
2019-09-05 Marcus Burghardt <mburghardt@mozilla.com>
* gtests/pk11_gtest/pk11_find_certs_unittest.cc:
Bug 1578751 - Ensure a consistent style for
pk11_find_certs_unittest.cc. r=jcj
Adjusted the style and clang-format after the changes in some var
names.
[e95fee7f59e5]
Differential Revision: https://phabricator.services.mozilla.com/D46246
--HG--
extra : moz-landing-system : lando
2019-09-18 06:27:20 +03:00
|
|
|
$(MAKE) -C $(CORE_DEPTH)/../nspr/$(OBJDIR_NAME)/pr/tests
|
2008-06-06 16:40:11 +04:00
|
|
|
|
2016-10-15 09:45:05 +03:00
|
|
|
install_nspr: build_nspr
|
|
|
|
$(MAKE) -C $(CORE_DEPTH)/../nspr/$(OBJDIR_NAME) install
|
|
|
|
|
2008-06-06 16:40:11 +04:00
|
|
|
clobber_nspr: $(NSPR_CONFIG_STATUS)
|
2013-04-12 03:46:53 +04:00
|
|
|
$(MAKE) -C $(CORE_DEPTH)/../nspr/$(OBJDIR_NAME) clobber
|
2008-06-06 16:40:11 +04:00
|
|
|
|
2013-04-12 03:46:53 +04:00
|
|
|
build_docs:
|
|
|
|
$(MAKE) -C $(CORE_DEPTH)/doc
|
2008-06-06 16:40:11 +04:00
|
|
|
|
2013-04-12 03:46:53 +04:00
|
|
|
clean_docs:
|
|
|
|
$(MAKE) -C $(CORE_DEPTH)/doc clean
|
2008-06-06 16:40:11 +04:00
|
|
|
|
2013-04-30 03:21:02 +04:00
|
|
|
nss_RelEng_bld: import all
|
2008-06-06 16:40:11 +04:00
|
|
|
|
|
|
|
package:
|
|
|
|
$(MAKE) -C pkg publish
|
2012-10-01 22:02:15 +04:00
|
|
|
|
2016-11-16 16:06:23 +03:00
|
|
|
latest:
|
|
|
|
echo $(OBJDIR_NAME) > $(CORE_DEPTH)/../dist/latest
|