From 8e09bbb3ad5b653bbefcf12360ccb0caf760da7d Mon Sep 17 00:00:00 2001 From: Philipp Jungkamp Date: Sat, 13 Aug 2022 16:58:32 +0000 Subject: [PATCH] Use master lib60870 instead of fork The main repository of lib60870 has merged the pkg-config file fork used until now. Use the main lib60870 instead of my fork for 'packaging/deps.sh'. --- packaging/deps.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packaging/deps.sh b/packaging/deps.sh index 3dadae418..dca16833e 100644 --- a/packaging/deps.sh +++ b/packaging/deps.sh @@ -148,10 +148,10 @@ if ! pkg-config "libiec61850 >= 1.3.1" && \ popd fi -# Build & Install lib60870 (fork with pkg-config file) +# Build & Install lib60870 if ! pkg-config "lib60870 >= 2.3.1" && \ [ -z "${SKIP_LIB60870}" ]; then - git clone ${GIT_OPTS} --branch pkgconfig https://github.com/PJungkamp/lib60870 + git clone ${GIT_OPTS} https://github.com/mz-automation/lib60870.git mkdir -p lib60870/build pushd lib60870/build cmake ${CMAKE_OPTS} ../lib60870-C