From 6e501ef1f66498d4f4e89de4a7d7d86491e9c41e Mon Sep 17 00:00:00 2001 From: Recep Aslantas Date: Sun, 28 Apr 2019 19:15:55 +0300 Subject: [PATCH 1/4] build: don't link libcmocka if not exists --- post-build.sh | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/post-build.sh b/post-build.sh index 9861ac4..dfe92cc 100644 --- a/post-build.sh +++ b/post-build.sh @@ -10,10 +10,15 @@ cd $(dirname "$0") mkdir -p .libs +libmocka_folder=$(pwd)/test/lib/cmocka/build/src/ + if [ "$(uname)" = "Darwin" ]; then - ln -sf $(pwd)/test/lib/cmocka/build/src/libcmocka.0.dylib \ - .libs/libcmocka.0.dylib; + libcmocka=libcmocka.0.dylib else - ln -sf $(pwd)/test/lib/cmocka/build/src/libcmocka.so.0 \ - .libs/libcmocka.so.0; + libcmocka=libcmocka.so.0 +fi + +libcmocka_fullpath="$libmocka_folder$libcmocka" +if [ ! -f libcmocka ]; then + ln -sf libcmocka .libs/$libcmocka; fi From 010e887946a1e294739117a8474050626cc3821d Mon Sep 17 00:00:00 2001 From: Recep Aslantas Date: Sun, 28 Apr 2019 19:21:13 +0300 Subject: [PATCH 2/4] build: don't link libcmocka if not exists --- post-build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/post-build.sh b/post-build.sh index dfe92cc..880f7aa 100644 --- a/post-build.sh +++ b/post-build.sh @@ -19,6 +19,6 @@ else fi libcmocka_fullpath="$libmocka_folder$libcmocka" -if [ ! -f libcmocka ]; then - ln -sf libcmocka .libs/$libcmocka; +if [ ! -f libcmocka_fullpath ]; then + ln -sf libcmocka_fullpath .libs/$libcmocka; fi From a5f1ed32afe55144e2cfe14cc8a1b2be3afeaa55 Mon Sep 17 00:00:00 2001 From: Recep Aslantas Date: Sun, 28 Apr 2019 19:24:09 +0300 Subject: [PATCH 3/4] build: don't link libcmocka if not exists --- post-build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/post-build.sh b/post-build.sh index 880f7aa..2374189 100644 --- a/post-build.sh +++ b/post-build.sh @@ -20,5 +20,5 @@ fi libcmocka_fullpath="$libmocka_folder$libcmocka" if [ ! -f libcmocka_fullpath ]; then - ln -sf libcmocka_fullpath .libs/$libcmocka; + ln -sf $libcmocka_fullpath .libs/$libcmocka; fi From 120ae9ae99f9e27c5956e9969b88ff2c8be6ae2c Mon Sep 17 00:00:00 2001 From: Recep Aslantas Date: Sun, 28 Apr 2019 19:43:58 +0300 Subject: [PATCH 4/4] buil: fix linking cmocka --- post-build.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/post-build.sh b/post-build.sh index 2374189..6fa6e7a 100644 --- a/post-build.sh +++ b/post-build.sh @@ -8,7 +8,7 @@ cd $(dirname "$0") -mkdir -p .libs +mkdir -p "$(pwd)/.libs" libmocka_folder=$(pwd)/test/lib/cmocka/build/src/ @@ -18,7 +18,7 @@ else libcmocka=libcmocka.so.0 fi -libcmocka_fullpath="$libmocka_folder$libcmocka" -if [ ! -f libcmocka_fullpath ]; then - ln -sf $libcmocka_fullpath .libs/$libcmocka; +libcmocka_path="$libmocka_folder$libcmocka" +if [ -f "$libcmocka_path" ]; then + ln -sf "$libcmocka_path" "$(pwd)/.libs/$libcmocka"; fi