Skip to contentSkip to conversation

package/libwebsockets: fix static build

PATCH New Yann E. MORIN 2 participants 2 messages Nov 30, 2014

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/libwebsockets: fix static build

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.

Cc Sagaert Johan <[email protected]>
Cc Samuel Martin <[email protected]>
Cc Baruch Siach <[email protected]>

---
Changes v1 -> v2:
- remove spurious hunk
- fix typoes (Baruch, Samuel)

---
 ...le-shared-library-build-when-BUILD_SHARED.patch | 32 ++++++++++++++++++++--
 1 file changed, 29 insertions(+), 3 deletions(-)
package/libwebsockets/libwebsockets-0002-cmake-disable-shared-library-build-when-BUILD_SHARED.patch +29 -3
index 50e9a4e..95d1ad8 100644
@@ -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,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
Signature · 1 line
1.9.1
#1 lore raw

PATCH 1/1 package/libwebsockets: fix static build

Quoted 11 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Yann" == Yann E MORIN <[email protected]> writes:

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.

Cc Sagaert Johan <[email protected]>
Cc Samuel Martin <[email protected]>
Cc Baruch Siach <[email protected]>
Quoted 4 lines

---
Changes v1 -> v2:
- remove spurious hunk
- fix typoes (Baruch, Samuel)

Committed with autobuild references added, thanks.

Signature · 1 line
Bye, Peter Korsgaard