diff options
-rw-r--r-- | src/lib/libcrypto/generate_pkgconfig.sh | 5 | ||||
-rw-r--r-- | src/lib/libssl/generate_pkgconfig.sh | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/src/lib/libcrypto/generate_pkgconfig.sh b/src/lib/libcrypto/generate_pkgconfig.sh index e03f849e76..d9ee4e79e7 100644 --- a/src/lib/libcrypto/generate_pkgconfig.sh +++ b/src/lib/libcrypto/generate_pkgconfig.sh | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/bin/sh | 1 | #!/bin/sh |
2 | # | 2 | # |
3 | # $OpenBSD: generate_pkgconfig.sh,v 1.3 2021/06/08 11:19:39 inoguchi Exp $ | 3 | # $OpenBSD: generate_pkgconfig.sh,v 1.4 2022/02/04 16:42:15 tb Exp $ |
4 | # | 4 | # |
5 | # Copyright (c) 2010,2011 Jasper Lievisse Adriaanse <jasper@openbsd.org> | 5 | # Copyright (c) 2010,2011 Jasper Lievisse Adriaanse <jasper@openbsd.org> |
6 | # | 6 | # |
@@ -53,7 +53,8 @@ fi | |||
53 | version_re="s/^#define[[:blank:]]+SHLIB_VERSION_NUMBER[[:blank:]]+\"(.*)\".*/\1/p" | 53 | version_re="s/^#define[[:blank:]]+SHLIB_VERSION_NUMBER[[:blank:]]+\"(.*)\".*/\1/p" |
54 | #version_file=${curdir}/src/crypto/opensslv.h | 54 | #version_file=${curdir}/src/crypto/opensslv.h |
55 | version_file=${curdir}/opensslv.h | 55 | version_file=${curdir}/opensslv.h |
56 | lib_version=$(sed -nE ${version_re} ${version_file}) | 56 | #lib_version=$(sed -nE ${version_re} ${version_file}) |
57 | lib_version=2.0.0 | ||
57 | 58 | ||
58 | # Put -I${includedir} into Cflags so configure script tests like | 59 | # Put -I${includedir} into Cflags so configure script tests like |
59 | # test -n "`pkg-config --cflags openssl`" | 60 | # test -n "`pkg-config --cflags openssl`" |
diff --git a/src/lib/libssl/generate_pkgconfig.sh b/src/lib/libssl/generate_pkgconfig.sh index 4bc22c3267..e1e663f399 100644 --- a/src/lib/libssl/generate_pkgconfig.sh +++ b/src/lib/libssl/generate_pkgconfig.sh | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/bin/sh | 1 | #!/bin/sh |
2 | # | 2 | # |
3 | # $OpenBSD: generate_pkgconfig.sh,v 1.10 2021/06/08 11:19:39 inoguchi Exp $ | 3 | # $OpenBSD: generate_pkgconfig.sh,v 1.11 2022/02/04 16:42:15 tb Exp $ |
4 | # | 4 | # |
5 | # Copyright (c) 2010,2011 Jasper Lievisse Adriaanse <jasper@openbsd.org> | 5 | # Copyright (c) 2010,2011 Jasper Lievisse Adriaanse <jasper@openbsd.org> |
6 | # | 6 | # |
@@ -52,7 +52,8 @@ fi | |||
52 | 52 | ||
53 | version_re="s/^#define[[:blank:]]+SHLIB_VERSION_NUMBER[[:blank:]]+\"(.*)\".*/\1/p" | 53 | version_re="s/^#define[[:blank:]]+SHLIB_VERSION_NUMBER[[:blank:]]+\"(.*)\".*/\1/p" |
54 | version_file=${curdir}/../libcrypto/opensslv.h | 54 | version_file=${curdir}/../libcrypto/opensslv.h |
55 | lib_version=$(sed -nE ${version_re} ${version_file}) | 55 | #lib_version=$(sed -nE ${version_re} ${version_file}) |
56 | lib_version=2.0.0 | ||
56 | 57 | ||
57 | # Put -I${includedir} into Cflags so configure script tests like | 58 | # Put -I${includedir} into Cflags so configure script tests like |
58 | # test -n "`pkg-config --cflags openssl`" | 59 | # test -n "`pkg-config --cflags openssl`" |