remove no longer supported libmosquitto0, fix libssl3 detection+dependencies

This commit is contained in:
John
2023-08-06 08:11:45 +02:00
parent d442184f84
commit 8e55d44a14
+10 -12
View File
@@ -67,22 +67,20 @@ fi
make DESTDIR="$PWD/$RELEASE" install-strip || exit 1 make DESTDIR="$PWD/$RELEASE" install-strip || exit 1
extralibs= extralibs=
mqtt= mqtt=
ldd $RELEASE/usr/bin/ebusd | egrep -q libmosquitto.so.0 ldd $RELEASE/usr/bin/ebusd | egrep -q libmosquitto.so.1
if [ $? -eq 0 ]; then if [ $? -eq 0 ]; then
extralibs=', libmosquitto0' extralibs=', libmosquitto1'
PACKAGE="${PACKAGE}_mqtt0" PACKAGE="${PACKAGE}_mqtt1"
mqtt=1 mqtt=1
else
ldd $RELEASE/usr/bin/ebusd | egrep -q libmosquitto.so.1
if [ $? -eq 0 ]; then
extralibs=', libmosquitto1'
PACKAGE="${PACKAGE}_mqtt1"
mqtt=1
fi
fi fi
ldd $RELEASE/usr/bin/ebusd | egrep -q libssl.so.1.1 ldd $RELEASE/usr/bin/ebusd | egrep -q libssl.so.3
if [ $? -eq 0 ]; then if [ $? -eq 0 ]; then
extralibs="$extralibs, libssl1.1 (>= 1.1.0), ca-certificates" extralibs="$extralibs, libssl3 (>= 3.0.0), ca-certificates"
else
ldd $RELEASE/usr/bin/ebusd | egrep -q libssl.so.1.1
if [ $? -eq 0 ]; then
extralibs="$extralibs, libssl1.1 (>= 1.1.0), ca-certificates"
fi
fi fi
if [ -n "$RUNTEST" ]; then if [ -n "$RUNTEST" ]; then