Andrew Geissler | 615f2f1 | 2022-07-15 14:00:58 -0500 | [diff] [blame^] | 1 | From ea179d83b0aa62719d90748cd1fb260f40055f15 Mon Sep 17 00:00:00 2001 |
| 2 | From: Yi Zhao <yi.zhao@windriver.com> |
| 3 | Date: Mon, 13 Jun 2022 22:44:28 +0800 |
| 4 | Subject: [PATCH] configure.ac: eliminate build path from openvpn --version |
| 5 | option |
| 6 | |
| 7 | Before the patch: |
| 8 | $ openvpn --version |
| 9 | OpenVPN 2.5.7 x86_64-poky-linux-gnu [SSL (OpenSSL)] [LZO] [LZ4] [EPOLL] |
| 10 | [snip] |
| 11 | Compile time defines: enable_async_push=no enable_comp_stub=no |
| 12 | [snip] |
| 13 | with_crypto_library=openssl with_gnu_ld=yes |
| 14 | with_libtool_sysroot=/buildarea/build/tmp/work/core2-64-poky-linux/openvpn/2.5.7-r0/recipe-sysroot |
| 15 | with_mem_check=no with_openssl_engine=auto |
| 16 | |
| 17 | After the patch: |
| 18 | $ openvpn --version |
| 19 | OpenVPN 2.5.7 x86_64-poky-linux-gnu [SSL (OpenSSL)] [LZO] [LZ4] [EPOLL] |
| 20 | [snip] |
| 21 | Compile time defines: enable_async_push=no enable_comp_stub=no |
| 22 | [snip] |
| 23 | with_crypto_library=openssl with_gnu_ld=yes with_mem_check=no |
| 24 | with_openssl_engine=auto |
| 25 | |
| 26 | Upstream-Status: Inappropriate [embedded specific] |
| 27 | |
| 28 | Signed-off-by: Yi Zhao <yi.zhao@windriver.com> |
| 29 | --- |
| 30 | configure.ac | 2 +- |
| 31 | 1 file changed, 1 insertion(+), 1 deletion(-) |
| 32 | |
| 33 | diff --git a/configure.ac b/configure.ac |
| 34 | index 2f5f6bc..eddcbc5 100644 |
| 35 | --- a/configure.ac |
| 36 | +++ b/configure.ac |
| 37 | @@ -1377,7 +1377,7 @@ if test "${enable_async_push}" = "yes"; then |
| 38 | esac |
| 39 | fi |
| 40 | |
| 41 | -CONFIGURE_DEFINES="`set | grep '^enable_.*=' ; set | grep '^with_.*='`" |
| 42 | +CONFIGURE_DEFINES="`set | grep '^enable_.*=' ; set | grep '^with_.*=' | grep -v 'libtool_sysroot'`" |
| 43 | AC_DEFINE_UNQUOTED([CONFIGURE_DEFINES], ["`echo ${CONFIGURE_DEFINES}`"], [Configuration settings]) |
| 44 | |
| 45 | TAP_WIN_COMPONENT_ID="PRODUCT_TAP_WIN_COMPONENT_ID" |
| 46 | -- |
| 47 | 2.25.1 |
| 48 | |