blob: 02cd94a06cbc9ed702d1922e97c07500e57dcc97 [file] [log] [blame]
William A. Kennington III49e95662021-09-15 16:19:36 -07001From d9458227ddb4bbb8c63c607202a6854886d66090 Mon Sep 17 00:00:00 2001
Andrew Geissler4b7c1152020-11-30 19:55:29 -06002From: Mingli Yu <mingli.yu@windriver.com>
3Date: Wed, 4 Nov 2020 06:28:28 +0000
4Subject: [PATCH] configure.seed: fix host contamination
5
6Fix below error:
7This autoconf log indicates errors, it looked at host include and/or
8library paths while determining system capabilities.
9
10Upstream-Status: Inappropriate [OE specific]
11
12Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
13---
William A. Kennington III49e95662021-09-15 16:19:36 -070014 configure.seed | 43 +++----------------------------------------
15 1 file changed, 3 insertions(+), 40 deletions(-)
Andrew Geissler4b7c1152020-11-30 19:55:29 -060016
17diff --git a/configure.seed b/configure.seed
William A. Kennington III49e95662021-09-15 16:19:36 -070018index a148c530a..55bd49678 100644
Andrew Geissler4b7c1152020-11-30 19:55:29 -060019--- a/configure.seed
20+++ b/configure.seed
William A. Kennington III49e95662021-09-15 16:19:36 -070021@@ -144,31 +144,6 @@ fi
Andrew Geissler4b7c1152020-11-30 19:55:29 -060022 #
23 REVISION=`git log --pretty=oneline | wc -l`
24
25-if test -d "/usr/local/include"; then
26- CFLAGS="${CFLAGS} -I/usr/local/include"
27- CPPFLAGS="${CPPFLAGS} -I/usr/local/include"
28-fi
29-
30-if test -d "/usr/local/lib"; then
31- LDFLAGS="${LDFLAGS} -L/usr/local/lib"
32-fi
33-
34-if test -d /opt/local/include; then :
35- CFLAGS="${CFLAGS} -I/opt/local/include"
36- CPPFLAGS="${CPPFLAGS} -I/opt/local/include"
37-fi
38-
39-if test -d /opt/local/lib; then :
40- LDFLAGS="${LDFLAGS} -L/opt/local/lib"
41-fi
42-
43-if [ test -f /usr/bin/lsb_release ]; then
44- CODENAME=`/usr/bin/lsb_release -c|cut -f 2`
45- if [[ $CODENAME == "wheezy" ]]; then :
46- CPPFLAGS="${CPPFLAGS} -DOLD_NETFILTER_INTERFACE=1"
47- fi
48-fi
49-
50 SHORT_MACHINE=`uname -m | cut -b1-3`
51
52 GIT_RELEASE="@GIT_RELEASE@"
William A. Kennington III49e95662021-09-15 16:19:36 -070053@@ -293,23 +268,11 @@ fi
Andrew Geissler4b7c1152020-11-30 19:55:29 -060054 pkg-config --exists libssl
55 if test "$?" -ne 1; then
56 AC_DEFINE_UNQUOTED(NO_SSL_DL, 1, [has openssl])
57- SSL_INC="`pkg-config --cflags libssl` -I/usr/include/openssl"
58+ SSL_INC="`pkg-config --cflags libssl`"
59 SSL_LIB="`pkg-config --libs libssl` -lssl -lcrypto"
60 else
61- dnl Workaround for MacOS Brew
62- if test -d "/usr/local/opt/openssl/lib"; then
63- AC_DEFINE_UNQUOTED(NO_SSL_DL, 1, [has openssl])
64- SSL_INC="-I/usr/local/opt/openssl/include"
William A. Kennington III49e95662021-09-15 16:19:36 -070065- SSL_LIB="-L/usr/local/opt/openssl/lib -lssl -lcrypto"
Andrew Geissler4b7c1152020-11-30 19:55:29 -060066- dnl Workaround for FreeBSD
67- elif test -f "/usr/lib/libssl.so"; then
68- AC_DEFINE_UNQUOTED(NO_SSL_DL, 1, [has openssl])
69- SSL_INC="-I/usr/include"
70- SSL_LIB="-L/usr/lib -lssl -lcrypto"
71- else
72- echo "Please install openssl-dev(el) package prerequisite"
73- exit -1
74- fi
75+ echo "Please install openssl-dev(el) package prerequisite"
76+ exit -1
77 fi
78
79 AC_CHECK_LIB([gcrypt], [gcry_cipher_checktag], [LDFLAGS="${LDFLAGS} -lgcrypt"])
80--
William A. Kennington III49e95662021-09-15 16:19:36 -0700812.17.1
Andrew Geissler4b7c1152020-11-30 19:55:29 -060082