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