| Andrew Geissler | ac970dd | 2021-02-12 15:32:45 -0600 | [diff] [blame] | 1 | From 6f8ea2e841ad45eed193310b599d3f3b410ae91d Mon Sep 17 00:00:00 2001 |
| 2 | From: Mingli Yu <mingli.yu@windriver.com> |
| 3 | Date: Fri, 29 Jan 2021 08:49:15 +0000 |
| 4 | Subject: [PATCH] ac_add_search_path.m4: keep consistent between 32bit and 64bit |
| 5 | |
| 6 | With configure option "--with-openssl=${STAGING_EXECPREFIXDIR}", it behaves |
| 7 | differently between 32bit and 64bit system as the openssl lib resides under |
| 8 | /build/tmp/work/corei7-64-wrs-linux/net-snmp/5.9-r0/recipe-sysroot/usr/lib64 |
| 9 | for 64bit system, but resides under [1] for 32bit system. |
| 10 | |
| 11 | So add the patch to fix the gap between 32bit and 64bit system. |
| 12 | |
| 13 | [1] /build/tmp/work/corei7-64-wrs-linux/net-snmp/5.9-r0/recipe-sysroot/usr/lib |
| 14 | |
| 15 | Upstream-Status: Inappropriate [configuration specific] |
| 16 | |
| 17 | Signed-off-by: Mingli Yu <mingli.yu@windriver.com> |
| 18 | --- |
| 19 | m4/ac_add_search_path.m4 | 4 ++-- |
| 20 | 1 file changed, 2 insertions(+), 2 deletions(-) |
| 21 | |
| 22 | diff --git a/m4/ac_add_search_path.m4 b/m4/ac_add_search_path.m4 |
| 23 | index 8e0a819..961f587 100644 |
| 24 | --- a/m4/ac_add_search_path.m4 |
| 25 | +++ b/m4/ac_add_search_path.m4 |
| 26 | @@ -3,8 +3,8 @@ dnl Add a search path to the LIBS and CPPFLAGS variables |
| 27 | dnl |
| 28 | AC_DEFUN([AC_ADD_SEARCH_PATH],[ |
| 29 | if test "x$1" != x -a -d $1; then |
| 30 | - if test -d $1/lib; then |
| 31 | - LDFLAGS="-L$1/lib $LDFLAGS" |
| 32 | + if test -d $1/${libdir:5}; then |
| 33 | + LDFLAGS="-L$1/${libdir:5} $LDFLAGS" |
| 34 | fi |
| 35 | if test -d $1/include; then |
| 36 | CPPFLAGS="-I$1/include $CPPFLAGS" |
| 37 | -- |
| 38 | 2.29.2 |
| 39 | |