!6 update to v4.0.20

Merge pull request !6 from Zhangxiaoyu/master
This commit is contained in:
openeuler-ci-bot 2020-07-31 11:04:46 +08:00 committed by Gitee
commit fe399eb45b
3 changed files with 12 additions and 7 deletions

View File

@ -1,14 +1,13 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index c62d7f9..b046e90 100644
index f3d3433..2b9ffec 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -344,6 +344,8 @@ set(LWS_LIBRARY_VERSION_PATCH ${CPACK_PACKAGE_VERSION_PATCH})
@@ -353,6 +353,7 @@ set(LWS_LIBRARY_VERSION_PATCH ${CPACK_PACKAGE_VERSION_PATCH})
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${PROJECT_SOURCE_DIR}/cmake/")
+set(CMAKE_C_FLAGS "-Wl,-z,now ${CMAKE_C_FLAGS}")
+
message(STATUS "CMAKE_TOOLCHAIN_FILE='${CMAKE_TOOLCHAIN_FILE}'")
if(WIN32)

View File

@ -1,5 +1,5 @@
Name: libwebsockets
Version: 4.0.1
Version: 4.0.20
Release: 1
Summary: A lightweight C library for Websockets
License: LGPLv2 and Public Domain and BSD and MIT and zlib
@ -70,7 +70,7 @@ cd build
cd build
%make_install
cp -a %{_libdir}/libwebsockets.so.12* %{buildroot}%{_libdir}
cp -a %{_libdir}/libwebsockets.so.16* %{buildroot}%{_libdir}
%delete_la_and_a
find %{buildroot} -name '*.cmake' -exec rm -f {} ';'
@ -98,6 +98,12 @@ find %{buildroot} -name '*_static.pc' -exec rm -f {} ';'
%doc changelog README.md READMEs/
%changelog
* Wed Jul 29 2020 <zhangxiaoyu58@huawei.com> - 4.0.20-1
- Type:requirement
- ID:NA
- SUG:NA
- DESC:update to 4.0.20
* Tue Jun 9 2020 zhujunhao <zhujunhao8@huawei.com> - 4.0.1-1
- Type:requirement
- ID:NA