summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Relyea <rrelyea@redhat.com>2021-07-13 10:40:52 -0700
committerRobert Relyea <rrelyea@redhat.com>2021-07-13 10:40:52 -0700
commita1d693ee50d184c25f5f73168d2a22f9d7604049 (patch)
tree35a42d94d9d2e9cfcf56b601eb98ae837e17fcf0
parent6c3923cdb3368bce9b3fe6877120d040757d5434 (diff)
downloadnss-hg-a1d693ee50d184c25f5f73168d2a22f9d7604049.tar.gz
Bug 1720227 NSS using a tempdir to measure sql performance not active r=mt
Last rebase we submitted a patch that used a subdirectory to measure the performance for the SQLite patch. This code wasn't active by default on linux, however, because of a typo in the build system. This is a low priority issue since NSS does not default to measure, so the patch only affects older versions of RHEL or users that have explicitly asked for 'measure' semantics.
-rw-r--r--coreconf/Linux.mk2
-rw-r--r--coreconf/config.gypi2
2 files changed, 2 insertions, 2 deletions
diff --git a/coreconf/Linux.mk b/coreconf/Linux.mk
index 70651e28f..d5dfb6fbc 100644
--- a/coreconf/Linux.mk
+++ b/coreconf/Linux.mk
@@ -21,7 +21,7 @@ ifeq ($(USE_PTHREADS),1)
endif
DEFAULT_COMPILER = gcc
-DEFINES += -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_POSIX_SOURCE -DSQL_MEASURE_USE_TEMP_DIR
+DEFINES += -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_POSIX_SOURCE -DSDB_MEASURE_USE_TEMP_DIR
ifeq ($(OS_TARGET),Android)
ifndef ANDROID_NDK
diff --git a/coreconf/config.gypi b/coreconf/config.gypi
index 0867ba2c9..31710abc5 100644
--- a/coreconf/config.gypi
+++ b/coreconf/config.gypi
@@ -370,7 +370,7 @@
'_DEFAULT_SOURCE', # for <endian.h> functions, strdup, realpath, and getentropy
'_BSD_SOURCE', # for the above in glibc <= 2.19
'_POSIX_SOURCE', # for <signal.h>
- 'SQL_MEASURE_USE_TEMP_DIR', # use tmpdir for the access calls
+ 'SDB_MEASURE_USE_TEMP_DIR', # use tmpdir for the access calls
],
}],
[ 'OS=="dragonfly" or OS=="freebsd"', {