[Armadeus-commitlog] armadeus branch, master, updated. armadeus-7.0-41-g29e5f6b83
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. armadeus-7.0-41-g29e5f6b83
|
From: Sébastien S. <ss...@us...> - 2019-04-01 07:11:50
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via 29e5f6b8300f9f89713f9d773c6ee9fe0efc5ed9 (commit)
from 0f0d89b2ec00fd7d3fc3572dbc22370a178a9dc7 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 29e5f6b8300f9f89713f9d773c6ee9fe0efc5ed9
Author: Sébastien Szymanski <seb...@ar...>
Date: Mon Apr 1 09:11:07 2019 +0200
[BUILDROOT] 2019.02: remove patch 305 as it's now in 2019.02.1
-----------------------------------------------------------------------
Summary of changes:
...5webkit-select-leveldb-package-and-memenv.patch | 106 ---------------------
1 file changed, 106 deletions(-)
delete mode 100644 patches/buildroot/2019.02/305-qt5webkit-select-leveldb-package-and-memenv.patch
diff --git a/patches/buildroot/2019.02/305-qt5webkit-select-leveldb-package-and-memenv.patch b/patches/buildroot/2019.02/305-qt5webkit-select-leveldb-package-and-memenv.patch
deleted file mode 100644
index bc909bbf0..000000000
--- a/patches/buildroot/2019.02/305-qt5webkit-select-leveldb-package-and-memenv.patch
+++ /dev/null
@@ -1,106 +0,0 @@
-From 330df9cecd81b8820ac0ac926f9a2f4bfd28ce65 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Ga=C3=ABl=20PORTAY?= <gae...@co...>
-Date: Wed, 2 Jan 2019 15:56:30 -0500
-Subject: [PATCH 305/309] qt5webkit: select leveldb package and memenv
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-This patch fixes the build issue reported by autobuilder [0].
-
- /home/naourr/work/instance-2/output/build/qt5webkit-5.9.1/Source/WebCore//.obj/platform/leveldb/LevelDBDatabase.o: In function
- `WebCore::LevelDBDatabase::openInMemory(WebCore::LevelDBComparator const*)':
- LevelDBDatabase.cpp.text._ZN7WebCore15LevelDBDatabase12openInMemoryEPKNS_17LevelDBComparatorE+0x34): undefined reference to `leveldb::NewMemEnv(leveldb::Env*)'
- collect2: error: ld returned 1 exit status
- make[3]: *** [Makefile.api:97: ../lib/libQt5WebKit.so.5.9.1]
- Error 1
-
-The issue happens when both packages leveldb and qt5webkit are enabled.
-
-QtWebKit builds its own copy of leveldb [1] (as a third-party) if the
-system does not provided it (i.e. buildroot). It builds it differently
-and this is the origin of that issue. Instead of using the Makefile
-provided by leveldb [2], QtWebKit uses qmake to build that library [3].
-
-The missing symbol issue happens because the symbol leveldb::NewMemEnv
-is bundled in the static library libmemenv.a (aside libleveldb.so).
-This static library consists of this single symbol which is like an
-extra that is built but *NOT* shipped by default at installation in the
-staging directory. Unfortunatly, that symbol is required later by
-WebCore [4].
-
-The copy built by QtWebKit is an all-in-one library including both
-libleveldb and libmemenv; thus QtWebKit links against libleveldb only.
-Also, the linker finds the buildroot's copy first (not the third-party):
-that explains why it is complaining about a missing symbol. That copy
-does not have the symbol leveldb::NewMemEnv.
-
-Fortunatly, QtWebKit provides a facility to link against the system
-leveldb package. The qmake flag WEBKIT_CONFIG+=use_system_leveldb tells
-Qt5WebKit to link against libleveldb *AND* libmemenv [5].
-
-To fix that issue, this commit selects the package leveldb that now
-installs the libmemenv static library and its header. It ensures that
-QtWebKit has everything it needs to be built. It also sets the
-appropriate qmake configure flags to tell QtWebKit to use the leveldb
-copy built by buildroot instead of the bundled one.
-
-[0]: http://autobuild.buildroot.net/results/46033e82adf592c3b92c6d50cfaf45bd58beeaa4
-[1]: https://github.com/qt/qtwebkit/tree/5.9/Source/ThirdParty/leveldb
-[2]: https://github.com/qt/qtwebkit/blob/5.9/Source/ThirdParty/leveldb/Makefile#L167-L169
-[3]: https://github.com/qt/qtwebkit/blob/5.9/Source/ThirdParty/leveldb/Target.pri#L80
-[4]: https://github.com/qt/qtwebkit/blob/5.9/Source/WebCore/platform/leveldb/LevelDBDatabase.cpp#L185
-[5]: https://github.com/qt/qtwebkit/blob/5.9/Source/WebCore/WebCore.pri#L254
-[6]: https://github.com/google/leveldb/commit/739c25100e46576cdcdfff2d6f43f9f7008103c7
-
-Signed-off-by: Gaël PORTAY <gae...@co...>
-Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <ar...@mi...>
-(cherry picked from commit 2d7c746ed8c89ad262ef0c6db5460ade1fc35973)
----
- package/qt5/qt5webkit/Config.in | 3 +++
- package/qt5/qt5webkit/qt5webkit.mk | 4 ++--
- 2 files changed, 5 insertions(+), 2 deletions(-)
-
-diff --git a/package/qt5/qt5webkit/Config.in b/package/qt5/qt5webkit/Config.in
-index 72c641b9f7..e8008f7bab 100644
---- a/package/qt5/qt5webkit/Config.in
-+++ b/package/qt5/qt5webkit/Config.in
-@@ -3,10 +3,13 @@ config BR2_PACKAGE_QT5WEBKIT
- depends on !BR2_STATIC_LIBS
- depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE
- depends on BR2_HOST_GCC_AT_LEAST_4_8 # icu
-+ depends on BR2_INSTALL_LIBSTDCPP # leveldb
- depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # icu
-+ depends on BR2_TOOLCHAIN_HAS_THREADS # leveldb
- depends on !BR2_BINFMT_FLAT # icu
- # assumes a FPU is available on MIPS
- depends on !BR2_MIPS_SOFT_FLOAT
-+ select BR2_PACKAGE_LEVELDB
- select BR2_PACKAGE_QT5BASE
- select BR2_PACKAGE_QT5BASE_ICU
- select BR2_PACKAGE_QT5BASE_GUI
-diff --git a/package/qt5/qt5webkit/qt5webkit.mk b/package/qt5/qt5webkit/qt5webkit.mk
-index e8d368fb01..a0a0998d12 100644
---- a/package/qt5/qt5webkit/qt5webkit.mk
-+++ b/package/qt5/qt5webkit/qt5webkit.mk
-@@ -16,7 +16,7 @@ endif
- QT5WEBKIT_SOURCE = qtwebkit-opensource-src-$(QT5WEBKIT_VERSION).tar.xz
- QT5WEBKIT_DEPENDENCIES = \
- host-bison host-flex host-gperf host-python host-ruby \
-- qt5base sqlite
-+ leveldb qt5base sqlite
- QT5WEBKIT_INSTALL_STAGING = YES
-
- QT5WEBKIT_LICENSE_FILES = Source/WebCore/LICENSE-LGPL-2 Source/WebCore/LICENSE-LGPL-2.1
-@@ -45,7 +45,7 @@ endef
- QT5WEBKIT_PRE_CONFIGURE_HOOKS += QT5WEBKIT_PYTHON2_SYMLINK
-
- define QT5WEBKIT_CONFIGURE_CMDS
-- (cd $(@D); $(TARGET_MAKE_ENV) $(QT5WEBKIT_ENV) $(HOST_DIR)/bin/qmake)
-+ (cd $(@D); $(TARGET_MAKE_ENV) $(QT5WEBKIT_ENV) $(HOST_DIR)/bin/qmake WEBKIT_CONFIG+=use_system_leveldb)
- endef
-
- define QT5WEBKIT_BUILD_CMDS
---
-2.19.2
-
hooks/post-receive
--
armadeus
|