libws: fix LWS_INSTALL_LIBDIR

hanwckf · Dec 30, 2020 · d218f5f · d218f5f
1 parent c3993d4
commit d218f5f
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 0 deletions.
diff --git a/trunk/libs/libwebsockets/Makefile b/trunk/libs/libwebsockets/Makefile
@@ -12,6 +12,7 @@ download_test:
 extract_test:
 	( if [ ! -d $(SRC_NAME) ]; then \
 		tar -xf $(SRC_NAME).tar.gz; \
+		patch -p1 -d $(SRC_NAME) < $(SRC_NAME).patch ; \
 	fi )
 
 config_test:

diff --git a/trunk/libs/libwebsockets/libwebsockets-4.1.4.patch b/trunk/libs/libwebsockets/libwebsockets-4.1.4.patch
@@ -0,0 +1,12 @@
+diff -rupw libwebsockets-4.1.4-orig/cmake/lws_config.h.in libwebsockets-4.1.4/cmake/lws_config.h.in
+--- libwebsockets-4.1.4-orig/cmake/lws_config.h.in	2020-10-26 19:31:31.000000000 +0800
++++ libwebsockets-4.1.4/cmake/lws_config.h.in	2020-12-30 09:55:18.141019011 +0800
+@@ -7,7 +7,7 @@
+ #endif
+
+ #define LWS_INSTALL_DATADIR "${CMAKE_INSTALL_PREFIX}/share"
+-#define LWS_INSTALL_LIBDIR "${CMAKE_INSTALL_PREFIX}/${LWS_INSTALL_LIB_DIR}${LIB_SUFFIX}"
++#define LWS_INSTALL_LIBDIR "/lib"
+ #define LWS_LIBRARY_VERSION_MAJOR ${LWS_LIBRARY_VERSION_MAJOR}
+ #define LWS_LIBRARY_VERSION_MINOR ${LWS_LIBRARY_VERSION_MINOR}
+ #define LWS_LIBRARY_VERSION_PATCH_ELABORATED ${LWS_LIBRARY_VERSION_PATCH_ELABORATED}