Use cross-cpp when extracting OpenSSL version.
This commit is contained in:
parent
183fc9ab77
commit
a448574c74
6
crypto/external/bsd/openssl/mkpc
vendored
6
crypto/external/bsd/openssl/mkpc
vendored
@ -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 @@ openssl.pc)
|
||||
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
|
||||
|
4
crypto/external/bsd/openssl/pkgconfig.mk
vendored
4
crypto/external/bsd/openssl/pkgconfig.mk
vendored
@ -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 @@ FILES+=${pkg}.pc
|
||||
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
|
||||
|
Loading…
Reference in New Issue
Block a user