From c89001b6e0f982bdb012ad4aa81a2ef1384bac06 Mon Sep 17 00:00:00 2001 From: Ned Wright Date: Thu, 6 Jul 2023 09:34:00 +0000 Subject: [PATCH] Change library locating --- nodes/http_transaction_handler/CMakeLists.txt | 6 +-- nodes/orchestration/CMakeLists.txt | 41 +++++++++++++------ 2 files changed, 31 insertions(+), 16 deletions(-) diff --git a/nodes/http_transaction_handler/CMakeLists.txt b/nodes/http_transaction_handler/CMakeLists.txt index f774c97..70f74e5 100755 --- a/nodes/http_transaction_handler/CMakeLists.txt +++ b/nodes/http_transaction_handler/CMakeLists.txt @@ -42,19 +42,19 @@ install(TARGETS cp-nano-http-transaction-handler DESTINATION bin) install(TARGETS cp-nano-http-transaction-handler DESTINATION http_transaction_handler_service/bin) execute_process ( - COMMAND bash -c "ldconfig -p | awk '/libpcre2-8.so/{sub(/[^/]*$/,\"\", $NF); path=$NF}END{system(\"ls \"path\"libpcre2-8.so*\")}' | awk '{printf $1\";\"}'" + COMMAND bash -c "find /usr/lib -name \"libpcre2-8.so*\" | awk '{printf $0\";\"}'" OUTPUT_VARIABLE pcre2-8 ) install(FILES ${pcre2-8} DESTINATION http_transaction_handler_service/lib) execute_process ( - COMMAND bash -c "ldconfig -p | awk '/libpcre2-posix.so/{sub(/[^/]*$/,\"\", $NF); path=$NF}END{system(\"ls \"path\"libpcre2-posix.so*\")}' | awk '{printf $1\";\"}'" + COMMAND bash -c "find /usr/lib -name \"libpcre2-posix.so*\" | awk '{printf $0\";\"}'" OUTPUT_VARIABLE pcre2-posix ) install(FILES ${pcre2-posix} DESTINATION http_transaction_handler_service/lib) execute_process ( - COMMAND bash -c "ldconfig -p | awk '/libxml2.so/{sub(/[^/]*$/,\"\", $NF); path=$NF}END{system(\"ls \"path\"libxml2.so*\")}' | awk '{printf $1\";\"}'" + COMMAND bash -c "find /usr/lib -name \"libxml2.so*\" | awk '{printf $0\";\"}'" OUTPUT_VARIABLE xml2 ) install(FILES ${xml2} DESTINATION http_transaction_handler_service/lib) diff --git a/nodes/orchestration/CMakeLists.txt b/nodes/orchestration/CMakeLists.txt index 086beae..836d8af 100755 --- a/nodes/orchestration/CMakeLists.txt +++ b/nodes/orchestration/CMakeLists.txt @@ -43,79 +43,94 @@ install(FILES package/certificate/public-keys/i2.pem DESTINATION orchestration/c install(FILES package/certificate/public-keys/stg-i2.pem DESTINATION orchestration/certificate/ PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ) execute_process ( - COMMAND bash -c "ldconfig -p | awk '/libboost_regex.so/{printf $NF\";\"}'" + COMMAND bash -c "find /usr/lib -name \"libboost_regex.so*\" | awk '{printf $0\";\"}'" OUTPUT_VARIABLE boost_regex ) install(FILES ${boost_regex} DESTINATION orchestration/lib/boost) execute_process ( - COMMAND bash -c "ldconfig -p | awk '/libboost_atomic.so/{printf $NF\";\"}'" + COMMAND bash -c "find /usr/lib -name \"libboost_atomic.so*\" | awk '{printf $0\";\"}'" OUTPUT_VARIABLE boost_atomic ) install(FILES ${boost_atomic} DESTINATION orchestration/lib/boost) execute_process ( - COMMAND bash -c "ldconfig -p | awk '/libboost_chrono.so/{printf $NF\";\"}'" + COMMAND bash -c "find /usr/lib -name \"libboost_chrono.so*\" | awk '{printf $0\";\"}'" OUTPUT_VARIABLE boost_chrono ) install(FILES ${boost_chrono} DESTINATION orchestration/lib/boost) execute_process ( - COMMAND bash -c "ldconfig -p | awk '/libboost_context.so/{printf $NF\";\"}'" + COMMAND bash -c "find /usr/lib -name \"libboost_context.so*\" | awk '{printf $0\";\"}'" OUTPUT_VARIABLE boost_context ) install(FILES ${boost_context} DESTINATION orchestration/lib/boost) execute_process ( - COMMAND bash -c "ldconfig -p | awk '/libboost_filesystem.so/{printf $NF\";\"}'" + COMMAND bash -c "find /usr/lib -name \"libboost_filesystem.so*\" | awk '{printf $0\";\"}'" OUTPUT_VARIABLE boost_filesystem ) install(FILES ${boost_filesystem} DESTINATION orchestration/lib/boost) execute_process ( - COMMAND bash -c "ldconfig -p | awk '/libboost_iostreams.so/{printf $NF\";\"}'" + COMMAND bash -c "find /usr/lib -name \"libboost_iostreams.so*\" | awk '{printf $0\";\"}'" OUTPUT_VARIABLE boost_iostreams ) install(FILES ${boost_iostreams} DESTINATION orchestration/lib/boost) execute_process ( - COMMAND bash -c "ldconfig -p | awk '/libboost_system.so/{printf $NF\";\"}'" + COMMAND bash -c "find /usr/lib -name \"libboost_system.so*\" | awk '{printf $0\";\"}'" OUTPUT_VARIABLE boost_system ) install(FILES ${boost_system} DESTINATION orchestration/lib/boost) execute_process ( - COMMAND bash -c "ldconfig -p | awk '/libboost_system.so/{printf $NF\";\"}'" + COMMAND bash -c "find /usr/lib -name \"libboost_system.so*\" | awk '{printf $0\";\"}'" OUTPUT_VARIABLE boost_system ) install(FILES ${boost_system} DESTINATION orchestration/lib/boost) execute_process ( - COMMAND bash -c "ldconfig -p | awk '/libboost_thread.so/{printf $NF\";\"}'" + COMMAND bash -c "find /usr/lib -name \"libboost_thread.so*\" | awk '{printf $0\";\"}'" OUTPUT_VARIABLE boost_thread ) install(FILES ${boost_thread} DESTINATION orchestration/lib/boost) execute_process ( - COMMAND bash -c "ldconfig -p | awk '/libcrypto.so/{printf $NF\";\"}'" + COMMAND bash -c "find /usr/lib -name \"libcrypto.so\" | awk '{printf $0\";\"}'" OUTPUT_VARIABLE crypto ) install(FILES ${crypto} DESTINATION orchestration/lib) +execute_process ( + COMMAND bash -c "find /lib -name \"libcrypto.so*\" | awk '{printf $0\";\"}'" + OUTPUT_VARIABLE crypto2 +) +install(FILES ${crypto2} DESTINATION orchestration/lib) execute_process ( - COMMAND bash -c "ldconfig -p | awk '/libssl.so/{printf $NF\";\"}'" + COMMAND bash -c "find /usr/lib -name \"libssl.so\" | awk '{printf $1\";\"}'" OUTPUT_VARIABLE ssl ) install(FILES ${ssl} DESTINATION orchestration/lib) +execute_process ( + COMMAND bash -c "find /lib -name \"libssl.so*\" | awk '{printf $1\";\"}'" + OUTPUT_VARIABLE ssl2 +) +install(FILES ${ssl2} DESTINATION orchestration/lib) execute_process ( - COMMAND bash -c "ldconfig -p | awk '/libcurl.so/{sub(/[^/]*$/,\"\", $NF); path=$NF}END{system(\"ls \"path\"libcurl.so*\")}' | awk '{printf $1\";\"}'" + COMMAND bash -c "find /usr/lib -name \"libcurl.so\" | awk '{printf $1\";\"}'" OUTPUT_VARIABLE curl ) install(FILES ${curl} DESTINATION orchestration/lib) +execute_process ( + COMMAND bash -c "find /lib -name \"libcurl.so*\" | awk '{printf $1\";\"}'" + OUTPUT_VARIABLE curl2 +) +install(FILES ${curl2} DESTINATION orchestration/lib) execute_process ( - COMMAND bash -c "ldconfig -p | awk '/libz.so/{sub(/[^/]*$/,\"\", $NF); path=$NF}END{system(\"ls \"path\"libz.so*\")}' | awk '{printf $1\";\"}'" + COMMAND bash -c "find /usr/lib -name \"libz.so*\" | awk '{printf $0\";\"}'" OUTPUT_VARIABLE z ) install(FILES ${z} DESTINATION orchestration/lib)