[src/trunk]: src/crypto/external/bsd/openssl Use cross-cpp when extracting Op...

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

details:   https://anonhg.NetBSD.org/src/rev/f5402768fa79
branches:  trunk
changeset: 330395:f5402768fa79
user:      joerg <joerg%NetBSD.org@localhost>
date:      Mon Jul 07 09:14:43 2014 +0000

description:
Use cross-cpp when extracting OpenSSL version.

diffstat:

 crypto/external/bsd/openssl/mkpc         |  6 +++---
 crypto/external/bsd/openssl/pkgconfig.mk |  4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diffs (40 lines):

diff -r c3b0a27313e0 -r f5402768fa79 crypto/external/bsd/openssl/mkpc
--- a/crypto/external/bsd/openssl/mkpc  Mon Jul 07 07:09:58 2014 +0000
+++ b/crypto/external/bsd/openssl/mkpc  Mon Jul 07 09:14:43 2014 +0000
@@ -1,9 +1,9 @@
 #!/bin/sh
-#      $NetBSD: mkpc,v 1.3 2013/02/01 21:02:48 christos Exp $
+#      $NetBSD: mkpc,v 1.4 2014/07/07 09:14:43 joerg Exp $
 
 getversion() {
        (echo '#include "opensslv.h"'; echo OPENSSL_VERSION_TEXT) |
-           cpp -I$1 | grep OpenSSL | cut -d ' ' -f 2
+           $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.3 2013/02/01 21:02:48 christos Exp $
+# \$NetBSD: mkpc,v 1.4 2014/07/07 09:14:43 joerg Exp $
 prefix=/usr
 exec_prefix=/usr
 libdir=/usr/lib
diff -r c3b0a27313e0 -r f5402768fa79 crypto/external/bsd/openssl/pkgconfig.mk
--- a/crypto/external/bsd/openssl/pkgconfig.mk  Mon Jul 07 07:09:58 2014 +0000
+++ b/crypto/external/bsd/openssl/pkgconfig.mk  Mon Jul 07 09:14:43 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: pkgconfig.mk,v 1.5 2014/04/07 17:40:49 apb Exp $
+# $NetBSD: pkgconfig.mk,v 1.6 2014/07/07 09:14:43 joerg Exp $
 
 .include <bsd.own.mk>
 
@@ -8,5 +8,5 @@
 FILESBUILD_${pkg}.pc=yes
 
 ${pkg}.pc: ${.CURDIR}/../../mkpc
-       ${HOST_SH} ${.ALLSRC} ${OPENSSLSRC}/crypto ${.TARGET} > ${.TARGET}
+       CPPFLAGS=${CPPFLAGS:N-DOPENSSLDIR=*:N-DENGINESDIR=*:Q} CPP=${CPP:Q} ${HOST_SH} ${.ALLSRC} ${OPENSSLSRC}/crypto ${.TARGET} > ${.TARGET}
 .endfor