Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
WG91
committed
Jun 17, 2019
1 parent
ba6403c
commit 10b7851
Showing
10 changed files
with
276 additions
and
62 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,9 @@ | ||
| SDKs/ | ||
| work/ | ||
| built/ | ||
| sources/ | ||
| config.site | ||
| x86_64* | ||
| i686* | ||
| mips* | ||
| arm* |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| package=native_comparisontool | ||
| $(package)_version=8c6666f | ||
| $(package)_download_path=https://github.com/theuni/bitcoind-comparisontool/raw/master | ||
| $(package)_file_name=pull-tests-$($(package)_version).jar | ||
| $(package)_sha256_hash=a865332b3827abcde684ab79f5f43c083b0b6a4c97ff5508c79f29fee24f11cd | ||
| $(package)_install_dirname=BitcoindComparisonTool_jar | ||
| $(package)_install_filename=BitcoindComparisonTool.jar | ||
|
|
||
| define $(package)_extract_cmds | ||
| endef | ||
|
|
||
| define $(package)_configure_cmds | ||
| endef | ||
|
|
||
| define $(package)_build_cmds | ||
| endef | ||
|
|
||
| define $(package)_stage_cmds | ||
| mkdir -p $($(package)_staging_prefix_dir)/share/$($(package)_install_dirname) && \ | ||
| cp $($(package)_source) $($(package)_staging_prefix_dir)/share/$($(package)_install_dirname)/$($(package)_install_filename) | ||
| endef |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,66 @@ | ||
| PACKAGE=qt46 | ||
| $(package)_version=4.6.4 | ||
| $(package)_download_path=http://download.qt-project.org/archive/qt/4.6/ | ||
| $(package)_file_name=qt-everywhere-opensource-src-$($(package)_version).tar.gz | ||
| $(package)_sha256_hash=9ad4d46c721b53a429ed5a2eecfd3c239a9ab566562f183f99d3125f1a234250 | ||
| $(package)_dependencies=openssl freetype dbus libX11 xproto libXext libICE libSM | ||
| $(package)_patches=stlfix.patch | ||
|
|
||
| define $(package)_set_vars | ||
| $(package)_config_opts = -prefix $(host_prefix) -headerdir $(host_prefix)/include/qt4 -bindir $(build_prefix)/bin | ||
| $(package)_config_opts += -release -no-separate-debug-info -opensource -confirm-license | ||
| $(package)_config_opts += -stl -qt-zlib | ||
|
|
||
| $(package)_config_opts += -nomake examples -nomake tests -nomake tools -nomake translations -nomake demos -nomake docs | ||
| $(package)_config_opts += -no-audio-backend -no-glib -no-nis -no-cups -no-iconv -no-gif -no-pch | ||
| $(package)_config_opts += -no-xkb -no-xrender -no-xrandr -no-xfixes -no-xcursor -no-xinerama -no-xsync -no-xinput -no-mitshm -no-xshape | ||
| $(package)_config_opts += -no-libtiff -no-fontconfig -openssl-linked | ||
| $(package)_config_opts += -no-sql-db2 -no-sql-ibase -no-sql-oci -no-sql-tds -no-sql-mysql | ||
| $(package)_config_opts += -no-sql-odbc -no-sql-psql -no-sql-sqlite -no-sql-sqlite2 | ||
| $(package)_config_opts += -no-xmlpatterns -no-multimedia -no-phonon -no-scripttools -no-declarative | ||
| $(package)_config_opts += -no-phonon-backend -no-webkit -no-javascript-jit -no-script | ||
| $(package)_config_opts += -no-svg -no-libjpeg -no-libtiff -no-libpng -no-libmng -no-qt3support -no-opengl | ||
|
|
||
| $(package)_config_opts_x86_64_linux += -platform linux-g++-64 | ||
| $(package)_config_opts_i686_linux = -platform linux-g++-32 | ||
| $(package)_build_env = QT_RCC_TEST=1 | ||
| endef | ||
|
|
||
| define $(package)_preprocess_cmds | ||
| sed -i.old "s|/include /usr/include||" config.tests/unix/freetype/freetype.pri && \ | ||
| sed -i.old "s|src_plugins.depends = src_gui src_sql src_svg|src_plugins.depends = src_gui src_sql|" src/src.pro && \ | ||
| sed -i.old "s|\.lower(|\.toLower(|g" src/network/ssl/qsslsocket_openssl.cpp && \ | ||
| sed -i.old "s|Key_BackSpace|Key_Backspace|" src/gui/itemviews/qabstractitemview.cpp && \ | ||
| sed -i.old "s|/usr/X11R6/lib64|$(host_prefix)/lib|" mkspecs/*/*.conf && \ | ||
| sed -i.old "s|/usr/X11R6/lib|$(host_prefix)/lib|" mkspecs/*/*.conf && \ | ||
| sed -i.old "s|/usr/X11R6/include|$(host_prefix)/include|" mkspecs/*/*.conf && \ | ||
| sed -i.old "s|QMAKE_LFLAGS_SHLIB\t+= -shared|QMAKE_LFLAGS_SHLIB\t+= -shared -Wl,--exclude-libs,ALL|" mkspecs/common/g++.conf && \ | ||
| sed -i.old "/SSLv2_client_method/d" src/network/ssl/qsslsocket_openssl.cpp src/network/ssl/qsslsocket_openssl_symbols.cpp && \ | ||
| sed -i.old "/SSLv2_server_method/d" src/network/ssl/qsslsocket_openssl.cpp src/network/ssl/qsslsocket_openssl_symbols.cpp && \ | ||
| patch -p1 < $($(package)_patch_dir)/stlfix.patch | ||
| endef | ||
|
|
||
| define $(package)_config_cmds | ||
| export PKG_CONFIG_SYSROOT_DIR=/ && \ | ||
| export PKG_CONFIG_LIBDIR=$(host_prefix)/lib/pkgconfig && \ | ||
| export PKG_CONFIG_PATH=$(host_prefix)/share/pkgconfig && \ | ||
| export CPATH=$(host_prefix)/include && \ | ||
| OPENSSL_LIBS='-L$(host_prefix)/lib -lssl -lcrypto' ./configure $($(package)_config_opts) && \ | ||
| cd tools/linguist/lrelease; ../../../bin/qmake -o Makefile lrelease.pro | ||
| endef | ||
|
|
||
| define $(package)_build_cmds | ||
| export CPATH=$(host_prefix)/include && \ | ||
| $(MAKE) -C src && \ | ||
| $(MAKE) -C tools/linguist/lrelease | ||
| endef | ||
|
|
||
| define $(package)_stage_cmds | ||
| $(MAKE) -C src INSTALL_ROOT=$($(package)_staging_dir) install && \ | ||
| $(MAKE) -C tools/linguist/lrelease INSTALL_ROOT=$($(package)_staging_dir) install | ||
| endef | ||
|
|
||
| define $(package)_postprocess_cmds | ||
| rm -rf mkspecs/ lib/cmake/ lib/*.prl lib/*.la && \ | ||
| find native/bin -type f -exec mv {} {}-qt4 \; | ||
| endef |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,35 @@ | ||
| diff --git a/include/boost/atomic/detail/cas128strong.hpp b/include/boost/atomic/detail/cas128strong.hpp | ||
| index 906c13e..dcb4d7d 100644 | ||
| --- a/include/boost/atomic/detail/cas128strong.hpp | ||
| +++ b/include/boost/atomic/detail/cas128strong.hpp | ||
| @@ -196,15 +196,17 @@ class base_atomic<T, void, 16, Sign> | ||
|
|
||
| public: | ||
| BOOST_DEFAULTED_FUNCTION(base_atomic(void), {}) | ||
| - explicit base_atomic(value_type const& v) BOOST_NOEXCEPT : v_(0) | ||
| + explicit base_atomic(value_type const& v) BOOST_NOEXCEPT | ||
| { | ||
| + memset(&v_, 0, sizeof(v_)); | ||
| memcpy(&v_, &v, sizeof(value_type)); | ||
| } | ||
|
|
||
| void | ||
| store(value_type const& value, memory_order order = memory_order_seq_cst) volatile BOOST_NOEXCEPT | ||
| { | ||
| - storage_type value_s = 0; | ||
| + storage_type value_s; | ||
| + memset(&value_s, 0, sizeof(value_s)); | ||
| memcpy(&value_s, &value, sizeof(value_type)); | ||
| platform_fence_before_store(order); | ||
| platform_store128(value_s, &v_); | ||
| @@ -247,7 +249,9 @@ class base_atomic<T, void, 16, Sign> | ||
| memory_order success_order, | ||
| memory_order failure_order) volatile BOOST_NOEXCEPT | ||
| { | ||
| - storage_type expected_s = 0, desired_s = 0; | ||
| + storage_type expected_s, desired_s; | ||
| + memset(&expected_s, 0, sizeof(expected_s)); | ||
| + memset(&desired_s, 0, sizeof(desired_s)); | ||
| memcpy(&expected_s, &expected, sizeof(value_type)); | ||
| memcpy(&desired_s, &desired, sizeof(value_type)); | ||
|
|
Oops, something went wrong.