Module Name: src
Committed By: ryo
Date: Fri Apr 6 15:47:08 UTC 2018
Modified Files:
src/crypto/external/bsd/openssl: mkpc
src/crypto/external/bsd/openssl.old: mkpc
Log Message:
when CPPFLAGS include a parameter that has any spaces (e.g.
CPPFLAGS="-DBN_LLONG=\"long long\""),
$CPP $CPPFLAGS fails. (aarch64--netbsd-clang: error: no such file or directory:
'long"')
advice to use "eval" by soda@. thanks.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/crypto/external/bsd/openssl/mkpc
cvs rdiff -u -r1.1.1.1 -r1.2 src/crypto/external/bsd/openssl.old/mkpc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/openssl/mkpc
diff -u src/crypto/external/bsd/openssl/mkpc:1.5 src/crypto/external/bsd/openssl/mkpc:1.6
--- src/crypto/external/bsd/openssl/mkpc:1.5 Thu Feb 8 21:57:23 2018
+++ src/crypto/external/bsd/openssl/mkpc Fri Apr 6 15:47:08 2018
@@ -1,9 +1,9 @@
#!/bin/sh
-# $NetBSD: mkpc,v 1.5 2018/02/08 21:57:23 christos Exp $
+# $NetBSD: mkpc,v 1.6 2018/04/06 15:47:08 ryo Exp $
getversion() {
(echo '#include "openssl/opensslv.h"'; echo OPENSSL_VERSION_TEXT) |
- $CPP $CPPFLAGS -I$1 | grep OpenSSL | cut -d ' ' -f 2
+ eval "$CPP $CPPFLAGS" -I$1 | grep OpenSSL | cut -d ' ' -f 2
}
VERSION="$(getversion $1)"
@@ -32,7 +32,7 @@ openssl.pc)
esac
cat << EOF > "$2"
-# \$NetBSD: mkpc,v 1.5 2018/02/08 21:57:23 christos Exp $
+# \$NetBSD: mkpc,v 1.6 2018/04/06 15:47:08 ryo Exp $
prefix=/usr
exec_prefix=/usr
libdir=/usr/lib
Index: src/crypto/external/bsd/openssl.old/mkpc
diff -u src/crypto/external/bsd/openssl.old/mkpc:1.1.1.1 src/crypto/external/bsd/openssl.old/mkpc:1.2
--- src/crypto/external/bsd/openssl.old/mkpc:1.1.1.1 Sat Feb 3 22:43:37 2018
+++ src/crypto/external/bsd/openssl.old/mkpc Fri Apr 6 15:47:08 2018
@@ -1,9 +1,9 @@
#!/bin/sh
-# $NetBSD: mkpc,v 1.1.1.1 2018/02/03 22:43:37 christos Exp $
+# $NetBSD: mkpc,v 1.2 2018/04/06 15:47:08 ryo Exp $
getversion() {
(echo '#include "opensslv.h"'; echo OPENSSL_VERSION_TEXT) |
- $CPP $CPPFLAGS -I$1 | grep OpenSSL | cut -d ' ' -f 2
+ eval "$CPP $CPPFLAGS" -I$1 | grep OpenSSL | cut -d ' ' -f 2
}
VERSION="$(getversion $1)"
@@ -32,7 +32,7 @@ openssl.pc)
esac
cat << EOF > "$2"
-# \$NetBSD: mkpc,v 1.1.1.1 2018/02/03 22:43:37 christos Exp $
+# \$NetBSD: mkpc,v 1.2 2018/04/06 15:47:08 ryo Exp $
prefix=/usr
exec_prefix=/usr
libdir=/usr/lib
