Commit 181a17f1 authored by Yann E. MORIN's avatar Yann E. MORIN Committed by Peter Korsgaard
Browse files

package/libwebsockets: fix static build 

Fixes:
http://autobuild.buildroot.net/results/afc/afc56e03a9d410563f43e5d26cf8b12fc4da7e5b/
http://autobuild.buildroot.net/results/922/9221b4967d069c9b634cb1f98ead193593d22dbc/



When the version was bumped, the existing patch to fix static linking
was not proprerly tested, and was missing three new locations to be
fixed.

[Peter: add autobuilder reference]
Signed-off-by: default avatar"Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Sagaert Johan <sagaert.johan@skynet.be>
Cc: Samuel Martin <s.martin49@gmail.com>
Cc: Baruch Siach <baruch@tkos.co.il>
Signed-off-by: default avatarPeter Korsgaard <peter@korsgaard.com>
parent 0eb95775

package/libwebsockets/libwebsockets-0002-cmake-disable-shared-library-build-when-BUILD_SHARED.patch

+29 −3
Original line number Diff line number Diff line
@@ -9,6 +9,8 @@ updating libwebsockets. 


Signed-off-by: Samuel Martin <s.martin49@gmail.com>

Signed-off-by: Sagaert Johan <sagaert.johan@skynet.be>

[yann.morin.1998@free.fr: further fix after the version bumped]

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>

---

 CMakeLists.txt | 17 ++++++++++++-----

 1 file changed, 12 insertions(+), 5 deletions(-)
@@ -76,6 +78,30 @@ index 7978845..89853ce 100644 
 	target_link_libraries(${lib} ${LIB_LIST})

 endforeach()

 

-- 

2.1.2

@@ -793,7 +800,7 @@

 set(LWS_INSTALL_CMAKE_DIR ${DEF_INSTALL_CMAKE_DIR} CACHE PATH "Installation directory for CMake files")

 

 # Export targets (This is used for other CMake projects to easily find the libraries and include files).

-export(TARGETS websockets websockets_shared

+export(TARGETS ${_libs_websockets}

         FILE "${PROJECT_BINARY_DIR}/LibwebsocketsTargets.cmake")

 export(PACKAGE libwebsockets)

 

@@ -829,7 +835,7 @@

                 ${PROJECT_BINARY_DIR}/LibwebsocketsConfigVersion.cmake 

                 @ONLY)

 

-set_target_properties(websockets websockets_shared 

+set_target_properties(${_libs_websockets}

 					PROPERTIES PUBLIC_HEADER "${HDR_PUBLIC}")

 

 #

@@ -837,7 +843,7 @@

 #

 

 # Install libs and headers.

-install(TARGETS websockets websockets_shared

+install(TARGETS ${_libs_websockets}

 		EXPORT LibwebsocketsTargets

 		LIBRARY DESTINATION "${LWS_INSTALL_LIB_DIR}${LIB_SUFFIX}" COMPONENT libraries

 		ARCHIVE DESTINATION "${LWS_INSTALL_LIB_DIR}${LIB_SUFFIX}" COMPONENT libraries