diff options
| author | Karl Palsson <karlp@etactica.com> | 2020-08-21 12:27:17 +0000 |
|---|---|---|
| committer | Karl Palsson <karlp@etactica.com> | 2020-08-21 13:13:45 +0000 |
| commit | d5bace89cf93f4dfab5f03f48ee87d06444876e8 (patch) | |
| tree | 7bda2b73e757167dc6700a931bb3a2535964fbd7 /libs/libwebsockets | |
| parent | 9fe6e7c31e032654f9ccf581e7673411883ab797 (diff) | |
Revert "libwebsockets: move to 3.2.1"
This reverts commit 7066486fbbfa1bb73fee74911a8306e3a534a6fe.
LWS 3.2.x and 4.0.x are broken on ath79 and malta-be, (at least)
See https://github.com/warmcat/libwebsockets/issues/2008
and
https://github.com/openwrt/packages/issues/13085
Restore a functional 3.1 release until upstream release.
Signed-off-by: Karl Palsson <karlp@etactica.com>
Diffstat (limited to 'libs/libwebsockets')
| -rw-r--r-- | libs/libwebsockets/Makefile | 6 | ||||
| -rw-r--r-- | libs/libwebsockets/patches/020-fix-travis.patch | 12 |
2 files changed, 9 insertions, 9 deletions
diff --git a/libs/libwebsockets/Makefile b/libs/libwebsockets/Makefile index d29629f55..b71759b04 100644 --- a/libs/libwebsockets/Makefile +++ b/libs/libwebsockets/Makefile @@ -8,13 +8,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libwebsockets -PKG_VERSION:=3.2.1 -PKG_RELEASE:=1 +PKG_VERSION:=3.1.0 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) PKG_SOURCE_URL:=https://codeload.github.com/warmcat/libwebsockets/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=5b1521002771420bc91e1c91f36bc51f54bf4035c4bebde296dec235a45c33df +PKG_HASH:=db948be74c78fc13f1f1a55e76707d7baae3a1c8f62b625f639e8f2736298324 PKG_SOURCE_VERSION:=v$(PKG_VERSION) diff --git a/libs/libwebsockets/patches/020-fix-travis.patch b/libs/libwebsockets/patches/020-fix-travis.patch index 15d0fe636..85b165f75 100644 --- a/libs/libwebsockets/patches/020-fix-travis.patch +++ b/libs/libwebsockets/patches/020-fix-travis.patch @@ -1,14 +1,14 @@ --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -1482,9 +1482,9 @@ if (CMAKE_COMPILER_IS_GNUCC OR CMAKE_COM - endif() +@@ -1233,9 +1233,9 @@ if (CMAKE_COMPILER_IS_GNUCC OR CMAKE_COM + endif() if (UNIX AND NOT LWS_WITH_ESP32) -- set(CMAKE_C_FLAGS "-Wall -Wsign-compare -Wuninitialized -Werror ${VISIBILITY_FLAG} -Wundef ${GCOV_FLAGS} ${CMAKE_C_FLAGS} ${ASAN_FLAGS}" ) -+ set(CMAKE_C_FLAGS "-Wall -Wsign-compare -Wuninitialized ${VISIBILITY_FLAG} -Wundef ${GCOV_FLAGS} ${CMAKE_C_FLAGS} ${ASAN_FLAGS}" ) +- set(CMAKE_C_FLAGS "-Wall -Wsign-compare -Wignored-qualifiers -Wtype-limits -Wuninitialized -Werror ${VISIBILITY_FLAG} -Wundef ${GCOV_FLAGS} ${CMAKE_C_FLAGS} ${ASAN_FLAGS}" ) ++ set(CMAKE_C_FLAGS "-Wall -Wsign-compare -Wignored-qualifiers -Wtype-limits -Wuninitialized ${VISIBILITY_FLAG} -Wundef ${GCOV_FLAGS} ${CMAKE_C_FLAGS} ${ASAN_FLAGS}" ) else() -- set(CMAKE_C_FLAGS "-Wall -Wsign-compare -Wuninitialized -Werror ${VISIBILITY_FLAG} ${GCOV_FLAGS} ${CMAKE_C_FLAGS}" ) -+ set(CMAKE_C_FLAGS "-Wall -Wsign-compare -Wuninitialized ${VISIBILITY_FLAG} ${GCOV_FLAGS} ${CMAKE_C_FLAGS}" ) +- set(CMAKE_C_FLAGS "-Wall -Wsign-compare -Wignored-qualifiers -Wtype-limits -Wuninitialized -Werror ${VISIBILITY_FLAG} ${GCOV_FLAGS} ${CMAKE_C_FLAGS}" ) ++ set(CMAKE_C_FLAGS "-Wall -Wsign-compare -Wignored-qualifiers -Wtype-limits -Wuninitialized ${VISIBILITY_FLAG} ${GCOV_FLAGS} ${CMAKE_C_FLAGS}" ) endif() endif () |