mirror of
https://abf.rosa.ru/djam/java-17-openjdk.git
synced 2025-04-19 14:14:10 +00:00
rediff path
This commit is contained in:
parent
a03fa43f45
commit
00ca0ab3b6
2 changed files with 3 additions and 3 deletions
|
@ -1843,7 +1843,7 @@ sed -e "s:@NSS_LIBDIR@:%{NSS_LIBDIR}:g" %{SOURCE11} > nss.cfg
|
||||||
|
|
||||||
# How many CPU's do we have?
|
# How many CPU's do we have?
|
||||||
NUM_PROC="$(getconf _NPROCESSORS_ONLN)"
|
NUM_PROC="$(getconf _NPROCESSORS_ONLN)"
|
||||||
[ -n "$NUM_PROC" ] && %(expr $NUM_PROC / 2 )
|
[ -z "$NUM_PROC" ] && NUM_PROC=8
|
||||||
|
|
||||||
%ifarch s390x sparc64 alpha %{power64} %{aarch64}
|
%ifarch s390x sparc64 alpha %{power64} %{aarch64}
|
||||||
export ARCH_DATA_MODEL=64
|
export ARCH_DATA_MODEL=64
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
diff --git a/src/java.base/share/conf/security/java.security b/src/java.base/share/conf/security/java.security
|
diff --git a/src/java.base/share/conf/security/java.security b/src/java.base/share/conf/security/java.security
|
||||||
index adfaf57d29e..abf89bbf327 100644
|
index fbbe754..0822502 100644
|
||||||
--- a/src/java.base/share/conf/security/java.security
|
--- a/src/java.base/share/conf/security/java.security
|
||||||
+++ b/src/java.base/share/conf/security/java.security
|
+++ b/src/java.base/share/conf/security/java.security
|
||||||
@@ -78,6 +78,7 @@ security.provider.tbd=SunMSCAPI
|
@@ -78,6 +78,7 @@ security.provider.tbd=SunMSCAPI
|
||||||
|
@ -9,4 +9,4 @@ index adfaf57d29e..abf89bbf327 100644
|
||||||
+#security.provider.tbd=SunPKCS11 ${java.home}/lib/security/nss.cfg
|
+#security.provider.tbd=SunPKCS11 ${java.home}/lib/security/nss.cfg
|
||||||
|
|
||||||
#
|
#
|
||||||
# Security providers used when FIPS mode support is active
|
# A list of preferred providers for specific algorithms. These providers will
|
||||||
|
|
Loading…
Add table
Reference in a new issue