deps: attempt to suppress macro-redefined warning

danbev · targos · commit 2b9fcdfe2657 · 2021-10-23T08:37:22.000+02:00
PR-URL: #40518 Refs: #40509 Reviewed-By: Richard Lau <rlau@redhat.com> Reviewed-By: Beth Griggs <bgriggs@redhat.com>
diff --git a/deps/openssl/openssl.gypi b/deps/openssl/openssl.gypi
@@ -1292,13 +1292,11 @@
       # Set to ubuntu default path for convenience. If necessary,
       # override this at runtime with the SSL_CERT_DIR environment
       # variable.
-      'OPENSSLDIR="/System/Library/OpenSSL/"',
     ],
     'openssl_default_defines_linux_others': [
       # Set to ubuntu default path for convenience. If necessary,
       # override this at runtime with the SSL_CERT_DIR environment
       # variable.
-      'OPENSSLDIR="/etc/ssl"',
     ]
   }
 }
diff --git a/deps/openssl/openssl_common.gypi b/deps/openssl/openssl_common.gypi
@@ -49,7 +49,6 @@
         'WARNING_CFLAGS': ['-Wno-missing-field-initializers']
       },
       'defines': [
-        'OPENSSLDIR="/System/Library/OpenSSL/"',
         'ENGINESDIR="/dev/null"',
       ],
     }, 'OS=="solaris"', {

Original file line number	Diff line number	Diff line change
`@@ -1292,13 +1292,11 @@`
`1292`	`1292`	`# Set to ubuntu default path for convenience. If necessary,`
`1293`	`1293`	`# override this at runtime with the SSL_CERT_DIR environment`
`1294`	`1294`	`# variable.`
`1295`		`- 'OPENSSLDIR="/System/Library/OpenSSL/"',`
`1296`	`1295`	`],`
`1297`	`1296`	`'openssl_default_defines_linux_others': [`
`1298`	`1297`	`# Set to ubuntu default path for convenience. If necessary,`
`1299`	`1298`	`# override this at runtime with the SSL_CERT_DIR environment`
`1300`	`1299`	`# variable.`
`1301`		`- 'OPENSSLDIR="/etc/ssl"',`
`1302`	`1300`	`]`
`1303`	`1301`	`}`
`1304`	`1302`	`}`