mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-07-16 04:17:25 +00:00
websocketpp: upgrade 0.8.1 -> 0.8.2
0001-Replace-make_shared-with-new-in-some-cases.patch 0002-Fix-missed-entries-fix-testing.patch 771.patch 842.patch removed since they are included in 0.8.2 Signed-off-by: Wang Mingyu <wangmy@cn.fujitsu.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Wang Mingyu
Khem Raj
+32
@@ -0,0 +1,32 @@
|
||||
From 5ccaff351297bca0e254bbfd66e3f03fef9d9c75 Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Fri, 10 Jan 2020 21:54:39 -0800
|
||||
Subject: [PATCH] Correct clang compiler flags
|
||||
|
||||
Fix misplaced quotes, this was leading to spurious ; in compiler cmdline
|
||||
Remove demanding libc++, clang can link with both libc++ and libstdc++
|
||||
and platforms have their own defaults, user can demand non defaults via
|
||||
adding it to cmake flags
|
||||
|
||||
Upstream-Status: Submitted [https://github.com/zaphoyd/websocketpp/pull/859]
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
---
|
||||
CMakeLists.txt | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 2d13117..c17354a 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -150,7 +150,7 @@ if (BUILD_TESTS OR BUILD_EXAMPLES)
|
||||
endif()
|
||||
set (WEBSOCKETPP_PLATFORM_TLS_LIBS ssl crypto)
|
||||
set (WEBSOCKETPP_BOOST_LIBS system thread)
|
||||
- set (CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS} "-std=c++0x -stdlib=libc++") # todo: is libc++ really needed here?
|
||||
+ set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x")
|
||||
if (NOT APPLE)
|
||||
add_definitions (-DNDEBUG -Wall -Wno-padded) # todo: should we use CMAKE_C_FLAGS for these?
|
||||
endif ()
|
||||
--
|
||||
2.24.1
|
||||
|
||||
+35
@@ -0,0 +1,35 @@
|
||||
From 771d79eeb0ac5079482a4b3a131bbda744793e7d Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Thu, 19 Dec 2019 20:07:11 -0800
|
||||
Subject: [PATCH] cmake: Use GNUInstallDirs
|
||||
|
||||
Helps install cmakefiles in right libdir
|
||||
|
||||
Upstream-Status: Submitted [https://github.com/zaphoyd/websocketpp/pull/854]
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
---
|
||||
CMakeLists.txt | 4 +++-
|
||||
1 file changed, 3 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 2786aba..080be3e 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -39,11 +39,13 @@ endif()
|
||||
|
||||
set_property(GLOBAL PROPERTY USE_FOLDERS ON)
|
||||
|
||||
+include(GNUInstallDirs)
|
||||
+
|
||||
set(INSTALL_INCLUDE_DIR include CACHE PATH "Installation directory for header files")
|
||||
if (WIN32 AND NOT CYGWIN)
|
||||
set (DEF_INSTALL_CMAKE_DIR cmake)
|
||||
else ()
|
||||
- set (DEF_INSTALL_CMAKE_DIR lib/cmake/websocketpp)
|
||||
+ set (DEF_INSTALL_CMAKE_DIR ${CMAKE_INSTALL_LIBDIR}/cmake/websocketpp)
|
||||
endif ()
|
||||
set (INSTALL_CMAKE_DIR ${DEF_INSTALL_CMAKE_DIR} CACHE PATH "Installation directory for CMake files")
|
||||
|
||||
--
|
||||
2.24.1
|
||||
|
||||
@@ -0,0 +1,23 @@
|
||||
From 3590d77bb9753fbbf076028e2395182ced6466ba Mon Sep 17 00:00:00 2001
|
||||
From: Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
|
||||
Date: Wed, 8 Jan 2020 17:59:48 +0100
|
||||
Subject: [PATCH] Fix cmake find boost with version >= 1.71
|
||||
|
||||
For some reasons "system;thread;random;unit_test_framework" was seen as a single module, because of the quotes.
|
||||
---
|
||||
CMakeLists.txt | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 2d13117b..9a46bc10 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -213,7 +213,7 @@ if (BUILD_TESTS OR BUILD_EXAMPLES)
|
||||
set (Boost_USE_MULTITHREADED TRUE)
|
||||
set (Boost_ADDITIONAL_VERSIONS "1.39.0" "1.40.0" "1.41.0" "1.42.0" "1.43.0" "1.44.0" "1.46.1") # todo: someone who knows better spesify these!
|
||||
|
||||
- find_package (Boost 1.39.0 COMPONENTS "${WEBSOCKETPP_BOOST_LIBS}")
|
||||
+ find_package (Boost 1.39.0 COMPONENTS ${WEBSOCKETPP_BOOST_LIBS})
|
||||
|
||||
if (Boost_FOUND)
|
||||
# Boost is a project wide global dependency.
|
||||
@@ -0,0 +1,132 @@
|
||||
From 931a55347a322f38eb82d5f387b2924e6c7a1746 Mon Sep 17 00:00:00 2001
|
||||
From: Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
|
||||
Date: Thu, 9 Jan 2020 10:07:20 +0100
|
||||
Subject: [PATCH] Update SConstruct with new Python3 syntax: - new raise
|
||||
keyword syntax - has_key deprecated method is now removed - commands
|
||||
deprecated library is replaced by subprocess - print function fixes
|
||||
|
||||
This should fix FTBFS against new scons 3.1.2
|
||||
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=947584
|
||||
---
|
||||
SConstruct | 45 +++++++++++++++++++++++----------------------
|
||||
1 file changed, 23 insertions(+), 22 deletions(-)
|
||||
|
||||
diff --git a/SConstruct b/SConstruct
|
||||
index ae3df10b..9d1c8914 100644
|
||||
--- a/SConstruct
|
||||
+++ b/SConstruct
|
||||
@@ -1,18 +1,19 @@
|
||||
-import os, sys, commands
|
||||
+import os, sys
|
||||
+from subprocess import check_output
|
||||
env = Environment(ENV = os.environ)
|
||||
|
||||
# figure out a better way to configure this
|
||||
-if os.environ.has_key('CXX'):
|
||||
+if 'CXX' in os.environ:
|
||||
env['CXX'] = os.environ['CXX']
|
||||
|
||||
-if os.environ.has_key('DEBUG'):
|
||||
+if 'DEBUG' in os.environ:
|
||||
env['DEBUG'] = os.environ['DEBUG']
|
||||
|
||||
-if os.environ.has_key('CXXFLAGS'):
|
||||
+if 'CXXFLAGS' in os.environ:
|
||||
#env['CXXFLAGS'] = os.environ['CXXFLAGS']
|
||||
env.Append(CXXFLAGS = os.environ['CXXFLAGS'])
|
||||
|
||||
-if os.environ.has_key('LINKFLAGS'):
|
||||
+if 'LINKFLAGS' in os.environ:
|
||||
#env['LDFLAGS'] = os.environ['LDFLAGS']
|
||||
env.Append(LINKFLAGS = os.environ['LINKFLAGS'])
|
||||
|
||||
@@ -22,24 +23,24 @@ if os.environ.has_key('LINKFLAGS'):
|
||||
## or set BOOST_INCLUDES and BOOST_LIBS if Boost comes with your OS distro e.g. and
|
||||
## needs BOOST_INCLUDES=/usr/include/boost and BOOST_LIBS=/usr/lib like Ubuntu.
|
||||
##
|
||||
-if os.environ.has_key('BOOSTROOT'):
|
||||
+if 'BOOSTROOT' in os.environ:
|
||||
os.environ['BOOST_ROOT'] = os.environ['BOOSTROOT']
|
||||
|
||||
-if os.environ.has_key('BOOST_ROOT'):
|
||||
+if 'BOOST_ROOT' in os.environ:
|
||||
env['BOOST_INCLUDES'] = os.environ['BOOST_ROOT']
|
||||
env['BOOST_LIBS'] = os.path.join(os.environ['BOOST_ROOT'], 'stage', 'lib')
|
||||
-elif os.environ.has_key('BOOST_INCLUDES') and os.environ.has_key('BOOST_LIBS'):
|
||||
+elif 'BOOST_INCLUDES' in os.environ and 'BOOST_LIBS' in os.environ:
|
||||
env['BOOST_INCLUDES'] = os.environ['BOOST_INCLUDES']
|
||||
env['BOOST_LIBS'] = os.environ['BOOST_LIBS']
|
||||
else:
|
||||
- raise SCons.Errors.UserError, "Neither BOOST_ROOT, nor BOOST_INCLUDES + BOOST_LIBS was set!"
|
||||
+ raise SCons.Errors.UserError("Neither BOOST_ROOT, nor BOOST_INCLUDES + BOOST_LIBS were set!")
|
||||
|
||||
## Custom OpenSSL
|
||||
-if os.environ.has_key('OPENSSL_PATH'):
|
||||
+if 'OPENSSL_PATH' in os.environ:
|
||||
env.Append(CPPPATH = os.path.join(os.environ['OPENSSL_PATH'], 'include'))
|
||||
env.Append(LIBPATH = os.environ['OPENSSL_PATH'])
|
||||
|
||||
-if os.environ.has_key('WSPP_ENABLE_CPP11'):
|
||||
+if 'WSPP_ENABLE_CPP11' in os.environ:
|
||||
env['WSPP_ENABLE_CPP11'] = True
|
||||
else:
|
||||
env['WSPP_ENABLE_CPP11'] = False
|
||||
@@ -76,7 +77,7 @@ if env['PLATFORM'].startswith('win'):
|
||||
env['CCFLAGS'] = '%s /EHsc /GR /GS- /MD /nologo %s %s' % (warn_flags, arch_flags, opt_flags)
|
||||
env['LINKFLAGS'] = '/INCREMENTAL:NO /MANIFEST /NOLOGO /OPT:REF /OPT:ICF /MACHINE:X86'
|
||||
elif env['PLATFORM'] == 'posix':
|
||||
- if env.has_key('DEBUG'):
|
||||
+ if 'DEBUG' in env:
|
||||
env.Append(CCFLAGS = ['-g', '-O0'])
|
||||
else:
|
||||
env.Append(CPPDEFINES = ['NDEBUG'])
|
||||
@@ -84,9 +85,9 @@ elif env['PLATFORM'] == 'posix':
|
||||
env.Append(CCFLAGS = ['-Wall'])
|
||||
#env['LINKFLAGS'] = ''
|
||||
elif env['PLATFORM'] == 'darwin':
|
||||
- if not os.environ.has_key('CXX'):
|
||||
+ if not 'CXX' in os.environ:
|
||||
env['CXX'] = "clang++"
|
||||
- if env.has_key('DEBUG'):
|
||||
+ if 'DEBUG' in env:
|
||||
env.Append(CCFLAGS = ['-g', '-O0'])
|
||||
else:
|
||||
env.Append(CPPDEFINES = ['NDEBUG'])
|
||||
@@ -157,29 +158,29 @@ env_cpp11 = env.Clone ()
|
||||
|
||||
if env_cpp11['CXX'].startswith('g++'):
|
||||
# TODO: check g++ version
|
||||
- GCC_VERSION = commands.getoutput(env_cpp11['CXX'] + ' -dumpversion')
|
||||
+ GCC_VERSION = check_output([env_cpp11['CXX'], '-dumpversion'])
|
||||
|
||||
- if GCC_VERSION > "4.4.0":
|
||||
- print "C++11 build environment partially enabled"
|
||||
+ if GCC_VERSION.decode('utf-8') > "4.4.0":
|
||||
+ print("C++11 build environment partially enabled")
|
||||
env_cpp11.Append(WSPP_CPP11_ENABLED = "true",CXXFLAGS = ['-std=c++0x'],TOOLSET = ['g++'],CPPDEFINES = ['_WEBSOCKETPP_CPP11_STL_'])
|
||||
else:
|
||||
- print "C++11 build environment is not supported on this version of G++"
|
||||
+ print("C++11 build environment is not supported on this version of G++")
|
||||
elif env_cpp11['CXX'].startswith('clang++'):
|
||||
- print "C++11 build environment enabled"
|
||||
+ print("C++11 build environment enabled")
|
||||
env.Append(CXXFLANGS = ['-stdlib=libc++'],LINKFLAGS=['-stdlib=libc++'])
|
||||
env_cpp11.Append(WSPP_CPP11_ENABLED = "true",CXXFLAGS = ['-std=c++0x','-stdlib=libc++'],LINKFLAGS = ['-stdlib=libc++'],TOOLSET = ['clang++'],CPPDEFINES = ['_WEBSOCKETPP_CPP11_STL_'])
|
||||
|
||||
# look for optional second boostroot compiled with clang's libc++ STL library
|
||||
# this prevents warnings/errors when linking code built with two different
|
||||
# incompatible STL libraries.
|
||||
- if os.environ.has_key('BOOST_ROOT_CPP11'):
|
||||
+ if 'BOOST_ROOT_CPP11' in os.environ:
|
||||
env_cpp11['BOOST_INCLUDES'] = os.environ['BOOST_ROOT_CPP11']
|
||||
env_cpp11['BOOST_LIBS'] = os.path.join(os.environ['BOOST_ROOT_CPP11'], 'stage', 'lib')
|
||||
- elif os.environ.has_key('BOOST_INCLUDES_CPP11') and os.environ.has_key('BOOST_LIBS_CPP11'):
|
||||
+ elif 'BOOST_INCLUDES_CPP11' in os.environ and 'BOOST_LIBS_CPP11' in os.environ:
|
||||
env_cpp11['BOOST_INCLUDES'] = os.environ['BOOST_INCLUDES_CPP11']
|
||||
env_cpp11['BOOST_LIBS'] = os.environ['BOOST_LIBS_CPP11']
|
||||
else:
|
||||
- print "C++11 build environment disabled"
|
||||
+ print("C++11 build environment disabled")
|
||||
|
||||
# if the build system is known to allow the isystem modifier for library include
|
||||
# values then use it for the boost libraries. Otherwise just add them to the
|
||||
Reference in New Issue
Block a user