[src/trunk]: src/crypto/external/bsd when CPPFLAGS include a parameter that h...

[ryo <ryo%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/8a4a35701d5e
branches:  trunk
changeset: 321801:8a4a35701d5e
user:      ryo <ryo%NetBSD.org@localhost>
date:      Fri Apr 06 15:47:08 2018 +0000

description:
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.

diffstat:

 crypto/external/bsd/openssl.old/mkpc |  6 +++---
 crypto/external/bsd/openssl/mkpc     |  6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diffs (48 lines):

diff -r cf88237b4780 -r 8a4a35701d5e crypto/external/bsd/openssl.old/mkpc
--- a/crypto/external/bsd/openssl.old/mkpc      Fri Apr 06 14:50:55 2018 +0000
+++ b/crypto/external/bsd/openssl.old/mkpc      Fri Apr 06 15:47:08 2018 +0000
@@ -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 @@
 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
diff -r cf88237b4780 -r 8a4a35701d5e crypto/external/bsd/openssl/mkpc
--- a/crypto/external/bsd/openssl/mkpc  Fri Apr 06 14:50:55 2018 +0000
+++ b/crypto/external/bsd/openssl/mkpc  Fri Apr 06 15:47:08 2018 +0000
@@ -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 @@
 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