From 3028e312a2fdc06627cdd8fb506b8fd6ad8bfa55 Mon Sep 17 00:00:00 2001 From: Lauri Tirkkonen Date: Tue, 25 Dec 2018 13:40:40 +0200 Subject: [PATCH] cmake: do not use -lnsl -lsocket even on "SunOS" --- .../developer/cmake/patches/no-lnsl-lsocket.patch | 36 ++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 components/developer/cmake/patches/no-lnsl-lsocket.patch diff --git a/components/developer/cmake/patches/no-lnsl-lsocket.patch b/components/developer/cmake/patches/no-lnsl-lsocket.patch new file mode 100644 index 000000000..5e18db063 --- /dev/null +++ b/components/developer/cmake/patches/no-lnsl-lsocket.patch @@ -0,0 +1,36 @@ +--- a/bootstrap Tue Dec 25 13:02:16 2018 ++++ b/bootstrap Tue Dec 25 13:02:28 2018 +@@ -1376,7 +1376,7 @@ + # Normally libuv uses '-D_XOPEN_SOURCE=500 -std=c90' on Solaris 5.10, + # but we do not need to do that because we bootstrap using POSIX APIs. + uv_c_flags="${uv_c_flags} -D__EXTENSIONS__ -D_XOPEN_SOURCE=600" +- libs="${libs} -lkstat -lnsl -lsendfile -lsocket -lrt" ++ libs="${libs} -lkstat -lsendfile -lrt" + ;; + esac + fi +--- a/Source/kwsys/CMakeLists.txt Tue Dec 25 13:12:08 2018 ++++ b/Source/kwsys/CMakeLists.txt Tue Dec 25 13:12:12 2018 +@@ -918,10 +918,6 @@ + TARGET_LINK_LIBRARIES(${KWSYS_TARGET_INTERFACE} ${KWSYS_LINK_DEPENDENCY} + ${CMAKE_DL_LIBS}) + ENDIF() +- IF (CMAKE_SYSTEM_NAME STREQUAL "SunOS") +- TARGET_LINK_LIBRARIES(${KWSYS_TARGET_INTERFACE} ${KWSYS_LINK_DEPENDENCY} +- socket) +- ENDIF() + ENDIF() + ENDIF() + +--- a/Utilities/cmlibuv/CMakeLists.txt Tue Dec 25 13:27:39 2018 ++++ b/Utilities/cmlibuv/CMakeLists.txt Tue Dec 25 13:27:48 2018 +@@ -241,9 +241,7 @@ + if(CMAKE_SYSTEM_NAME STREQUAL "SunOS") + list(APPEND uv_libraries + kstat +- nsl + sendfile +- socket + rt + ) + list(APPEND uv_headers -- 2.11.4.GIT