package/libwebsockets: fiux static build
PATCH 1/1 package/libwebsockets: fiux static build
When the version was bumped, the existing patch to fix static linking was not proprerly tested, and was missign three new locations to be fixed.
Signed-off-by "Yann E. MORIN" <[email protected]>
Cc Sagaert Johan <[email protected]>
Cc Samuel Martin <[email protected]>
--- ...le-shared-library-build-when-BUILD_SHARED.patch | 34 ++++++++++++++++++++-- 1 file changed, 31 insertions(+), 3 deletions(-)
package/libwebsockets/libwebsockets-0002-cmake-disable-shared-library-build-when-BUILD_SHARED.patch +31 -3
@@ -9,6 +9,8 @@ updating libwebsockets. Signed-off-by: Samuel Martin <[email protected]> Signed-off-by: Sagaert Johan <[email protected]> +[yann.morin.1998 at free.fr: further fix after the version bumped] +Signed-off-by: "Yann E. MORIN" <[email protected]> --- CMakeLists.txt | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-)
@@ -76,6 +78,32 @@ index 7978845..89853ce 100644 target_link_libraries(${lib} ${LIB_LIST}) endforeach() --- -2.1.2 - +@@ -800,9 +800,8 @@ + 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) + + # Generate the config file for the build-tree. + set(LWS__INCLUDE_DIRS +@@ -836,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}") + + # +@@ -844,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
Signature · 1 line
1.9.1
PATCH 1/1 package/libwebsockets: fiux static build
Hi Yann,
Quoted 3 lines · Yann E. MORIN
When the version was bumped, the existing patch to fix static linking was not proprerly tested, and was missign three new locations to be fixed.
For Subject: s/fiux/fix/
baruch
Signature · 3 lines
http://baruch.siach.name/blog/ ~. .~ Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
- baruch at tkos.co.il - tel: +972.2.679.5364, http://www.tkos.co.il -PATCH 1/1 package/libwebsockets: fiux static build
In reply to Yann E. MORINHi Yann,
Quoted 2 lines · Yann E. MORIN
When the version was bumped, the existing patch to fix static linking was not proprerly tested, and was missign three new locations to be
s/missign/missing/
Quoted 59 lines
fixed.
Signed-off-by "Yann E. MORIN" <[email protected]>Cc Sagaert Johan <[email protected]>Cc Samuel Martin <[email protected]>--- ...le-shared-library-build-when-BUILD_SHARED.patch | 34 ++++++++++++++++++++-- 1 file changed, 31 insertions(+), 3 deletions(-)package/libwebsockets/libwebsockets-0002-cmake-disable-shared-library-build-when-BUILD_SHARED.patch +31
-4@@ -9,6 +9,8 @@ updating libwebsockets. Signed-off-by: Samuel Martin <[email protected]> Signed-off-by: Sagaert Johan <[email protected]> +[yann.morin.1998 at free.fr: further fix after the version bumped] +Signed-off-by: "Yann E. MORIN" <[email protected]> --- CMakeLists.txt | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-)@@ -76,6 +78,32 @@ index 7978845..89853ce 100644 target_link_libraries(${lib} ${LIB_LIST}) endforeach() --- -2.1.2 - +@@ -800,9 +800,8 @@ + 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) + + # Generate the config file for the build-tree. + set(LWS__INCLUDE_DIRS +@@ -836,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}") + + # +@@ -844,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 --
Quoted 2 lines
1.9.1
Otherwise, it looks good.
Regards,
Signature · 1 line
Samuel