mirror of
https://github.com/dashpay/dash.git
synced 2024-12-25 12:02:48 +01:00
7d78f06a92
a5550f877a2c46d01bb620ae051c0c8ed0fecd0b build: use -stdlib++-isystem with Clang 10 (fanquake) 51d9d1607f2e9d593693ca799393f068192e41aa guix: use Clang 10 for the macOS cross compile (fanquake) b80a6af9e55325d444e117e85bbfc76d88d898a8 build: no longer patch threading out of ld64 (fanquake) c29cba44b3706e0a2035e440e560f2d15d50433b build: Xcode 12.1, macOS SDK 10.15.6 (fanquake) 9ed2f19d385aa95f65807999bba2e18417b143dc build: native cctools 973.0.1, ld64 609 (fanquake) f48f187cce7fa43646fb0d796c244e1515e763ec build: Clang 10.0.1 (Hennadii Stepanov) 9b193cd2a3ca20917611fbed56dfbcd8a39aeab8 build: libtapi 1100.0.11 (fanquake) Pull request description: Bumps our macOS toolchain to be using the following: * Clang 10.0.1 (gitian) & Clang 10.0.0 (Guix) * ld64 609 * libtapi 1100.0.11 * cctools 973.0.1 * Xcode 12.1 * macOS SDK 10.15.6 which are currently the most recent releases available as open source. See upstream [`cctools`](https://github.com/tpoechtrager/cctools-port/commits/973.0.1-ld64-609) and [`libtapi`](https://github.com/tpoechtrager/apple-libtapi/tree/1100.0.11). This should improve the possibility of Apple ARM cross-compilation in depends. This also removes our [patching out of pthreads usage](https://github.com/bitcoin/bitcoin/blob/master/depends/patches/native_cctools/ld64_disable_threading.patch) in `ld64`. There have been multiple changes since `ld64 450.3`, which have likely fixed the non-determinism we were working around. i.e from [InputFiles.cpp](https://opensource.apple.com/source/ld64/ld64-609/src/ld/InputFiles.cpp.auto.html): ```cpp // <rdar://problem/15002251> make implicit dylib order be deterministic by sorting by install_name std::sort(implicitDylibs.begin(), implicitDylibs.end(), DylibByInstallNameSorter()); ``` ```cpp // <rdar://problem/42675402> ld64 output is not deterministic due to dylib processing order std::sort(unprocessedDylibs.begin(), unprocessedDylibs.end(), [](const ld::dylib::File* lhs, const ld::dylib::File* rhs) { return strcmp(lhs->path(), rhs->path()) < 0; }); ``` Guix Build: ```bash find guix-build-$(git rev-parse --short=12 HEAD)/output/ -type f -print0 | env LC_ALL=C sort -z | xargs -r0 sha256sum f6c3817b8fe5f7370299d1ae2533e4a3acd313ba9f9aa8d423a8956117e52dd5 guix-build-a5550f877a2c/output/dist-archive/bitcoin-a5550f877a2c.tar.gz 4954dcf563c2d496b8d9fecd48f8e3f7fba2f319ffa254a5bc8ee12cfee6acf0 guix-build-a5550f877a2c/output/x86_64-apple-darwin18/bitcoin-a5550f877a2c-osx-unsigned.dmg 8f6095b445c7f1a8e6accd86bb7f0696d5849402084927d2b726b7d557831c3a guix-build-a5550f877a2c/output/x86_64-apple-darwin18/bitcoin-a5550f877a2c-osx-unsigned.tar.gz cc40f25477b4defc1617ae694313d80f307ddf6742fe6cc85c6bc0e215ef8be0 guix-build-a5550f877a2c/output/x86_64-apple-darwin18/bitcoin-a5550f877a2c-osx64.tar.gz ``` Gitian Build: ```bash Generating report 506a8abdefe559999b43dd9f14905b9b2b5a3363b1cd013d45ae47acc1f7ef6c bitcoin-a5550f877a2c-osx-unsigned.dmg f606997f74026dd12d110d683c6f116b40df324836904ef507dd7ac787e6ebe2 bitcoin-a5550f877a2c-osx-unsigned.tar.gz 5b495ef15f2c3260c2950921b61326912a9bf533cccd51e13818809fd225489e bitcoin-a5550f877a2c-osx64.tar.gz f6c3817b8fe5f7370299d1ae2533e4a3acd313ba9f9aa8d423a8956117e52dd5 src/bitcoin-a5550f877a2c.tar.gz 9eb0221e962d2839770963bd03c6c9e98e8bf3078566bee2ae42f06233a710fa bitcoin-core-osx-22-res.yml Done. ``` ACKs for top commit: hebasto: ACK a5550f877a2c46d01bb620ae051c0c8ed0fecd0b Tree-SHA512: 504c4b0f9cd3b939714a322298320c5bde07e9356a48a9a000060b36f8dce4d6134ed60c3a5188810476a28ec5b108733eabbc6fb8053231b9ea8a494cc91b12
278 lines
14 KiB
Makefile
278 lines
14 KiB
Makefile
PACKAGE=qt
|
|
$(package)_version=5.12.11
|
|
$(package)_download_path=https://download.qt.io/official_releases/qt/5.12/$($(package)_version)/submodules
|
|
$(package)_suffix=everywhere-src-$($(package)_version).tar.xz
|
|
$(package)_file_name=qtbase-$($(package)_suffix)
|
|
$(package)_sha256_hash=1c1b4e33137ca77881074c140d54c3c9747e845a31338cfe8680f171f0bc3a39
|
|
$(package)_linux_dependencies=freetype fontconfig libxcb libxkbcommon
|
|
$(package)_qt_libs=corelib network widgets gui plugins testlib
|
|
$(package)_linguist_tools = lrelease lupdate lconvert
|
|
$(package)_patches = qt.pro qttools_src.pro
|
|
$(package)_patches += fix_qt_pkgconfig.patch mac-qmake.conf fix_no_printer.patch no-xlib.patch
|
|
$(package)_patches+= fix_android_qmake_conf.patch fix_android_jni_static.patch dont_hardcode_pwd.patch
|
|
$(package)_patches+= no_sdk_version_check.patch
|
|
$(package)_patches+= fix_lib_paths.patch fix_android_pch.patch
|
|
$(package)_patches+= fix_limits_header.patch
|
|
$(package)_patches+= fix_montery_include.patch
|
|
$(package)_patches += glibc_compatibility.patch
|
|
$(package)_patches+= qtbase-moc-ignore-gcc-macro.patch
|
|
|
|
# Update OSX_QT_TRANSLATIONS when this is updated
|
|
$(package)_qttranslations_file_name=qttranslations-$($(package)_suffix)
|
|
$(package)_qttranslations_sha256_hash=577b0668a777eb2b451c61e8d026d79285371597ce9df06b6dee6c814164b7c3
|
|
|
|
$(package)_qttools_file_name=qttools-$($(package)_suffix)
|
|
$(package)_qttools_sha256_hash=98b2aaca230458f65996f3534fd471d2ffd038dd58ac997c0589c06dc2385b4f
|
|
|
|
$(package)_extra_sources = $($(package)_qttranslations_file_name)
|
|
$(package)_extra_sources += $($(package)_qttools_file_name)
|
|
|
|
define $(package)_set_vars
|
|
$(package)_config_opts_release = -release
|
|
$(package)_config_opts_release += -silent
|
|
$(package)_config_opts_debug = -debug
|
|
$(package)_config_opts_debug += -optimized-tools
|
|
$(package)_config_opts += -bindir $(build_prefix)/bin
|
|
$(package)_config_opts += -c++std c++1z
|
|
$(package)_config_opts += -confirm-license
|
|
$(package)_config_opts += -hostprefix $(build_prefix)
|
|
$(package)_config_opts += -no-compile-examples
|
|
$(package)_config_opts += -no-cups
|
|
$(package)_config_opts += -no-egl
|
|
$(package)_config_opts += -no-eglfs
|
|
$(package)_config_opts += -no-freetype
|
|
$(package)_config_opts += -no-gif
|
|
$(package)_config_opts += -no-glib
|
|
$(package)_config_opts += -no-icu
|
|
$(package)_config_opts += -no-ico
|
|
$(package)_config_opts += -no-iconv
|
|
$(package)_config_opts += -no-kms
|
|
$(package)_config_opts += -no-linuxfb
|
|
$(package)_config_opts += -no-libjpeg
|
|
$(package)_config_opts += -no-libproxy
|
|
$(package)_config_opts += -no-libudev
|
|
$(package)_config_opts += -no-mtdev
|
|
$(package)_config_opts += -no-openssl
|
|
$(package)_config_opts += -no-openvg
|
|
$(package)_config_opts += -no-reduce-relocations
|
|
$(package)_config_opts += -no-sctp
|
|
$(package)_config_opts += -no-securetransport
|
|
$(package)_config_opts += -no-sql-db2
|
|
$(package)_config_opts += -no-sql-ibase
|
|
$(package)_config_opts += -no-sql-oci
|
|
$(package)_config_opts += -no-sql-tds
|
|
$(package)_config_opts += -no-sql-mysql
|
|
$(package)_config_opts += -no-sql-odbc
|
|
$(package)_config_opts += -no-sql-psql
|
|
$(package)_config_opts += -no-sql-sqlite
|
|
$(package)_config_opts += -no-sql-sqlite2
|
|
$(package)_config_opts += -no-system-proxies
|
|
$(package)_config_opts += -no-use-gold-linker
|
|
$(package)_config_opts += -nomake examples
|
|
$(package)_config_opts += -nomake tests
|
|
$(package)_config_opts += -nomake tools
|
|
$(package)_config_opts += -opensource
|
|
$(package)_config_opts += -pkg-config
|
|
$(package)_config_opts += -prefix $(host_prefix)
|
|
$(package)_config_opts += -qt-libpng
|
|
$(package)_config_opts += -qt-pcre
|
|
$(package)_config_opts += -qt-harfbuzz
|
|
$(package)_config_opts += -qt-zlib
|
|
$(package)_config_opts += -static
|
|
$(package)_config_opts += -v
|
|
$(package)_config_opts += -no-feature-bearermanagement
|
|
$(package)_config_opts += -no-feature-colordialog
|
|
$(package)_config_opts += -no-feature-commandlineparser
|
|
$(package)_config_opts += -no-feature-concurrent
|
|
$(package)_config_opts += -no-feature-dial
|
|
$(package)_config_opts += -no-feature-fontcombobox
|
|
$(package)_config_opts += -no-feature-ftp
|
|
$(package)_config_opts += -no-feature-http
|
|
$(package)_config_opts += -no-feature-image_heuristic_mask
|
|
$(package)_config_opts += -no-feature-keysequenceedit
|
|
$(package)_config_opts += -no-feature-lcdnumber
|
|
$(package)_config_opts += -no-feature-networkdiskcache
|
|
$(package)_config_opts += -no-feature-networkproxy
|
|
$(package)_config_opts += -no-feature-pdf
|
|
$(package)_config_opts += -no-feature-printdialog
|
|
$(package)_config_opts += -no-feature-printer
|
|
$(package)_config_opts += -no-feature-printpreviewdialog
|
|
$(package)_config_opts += -no-feature-printpreviewwidget
|
|
$(package)_config_opts += -no-feature-sessionmanager
|
|
$(package)_config_opts += -no-feature-socks5
|
|
$(package)_config_opts += -no-feature-sql
|
|
$(package)_config_opts += -no-feature-sqlmodel
|
|
$(package)_config_opts += -no-feature-statemachine
|
|
$(package)_config_opts += -no-feature-syntaxhighlighter
|
|
$(package)_config_opts += -no-feature-textbrowser
|
|
$(package)_config_opts += -no-feature-textodfwriter
|
|
$(package)_config_opts += -no-feature-topleveldomain
|
|
$(package)_config_opts += -no-feature-undocommand
|
|
$(package)_config_opts += -no-feature-undogroup
|
|
$(package)_config_opts += -no-feature-undostack
|
|
$(package)_config_opts += -no-feature-undoview
|
|
$(package)_config_opts += -no-feature-vnc
|
|
$(package)_config_opts += -no-feature-wizard
|
|
$(package)_config_opts += -no-feature-xml
|
|
|
|
$(package)_config_opts_darwin = -no-dbus
|
|
$(package)_config_opts_darwin += -no-opengl
|
|
$(package)_config_opts_darwin += -pch
|
|
$(package)_config_opts_darwin += -no-feature-corewlan
|
|
$(package)_config_opts_darwin += QMAKE_MACOSX_DEPLOYMENT_TARGET=$(OSX_MIN_VERSION)
|
|
|
|
ifneq ($(build_os),darwin)
|
|
$(package)_config_opts_darwin += -xplatform macx-clang-linux
|
|
$(package)_config_opts_darwin += -device-option MAC_SDK_PATH=$(OSX_SDK)
|
|
$(package)_config_opts_darwin += -device-option MAC_SDK_VERSION=$(OSX_SDK_VERSION)
|
|
$(package)_config_opts_darwin += -device-option CROSS_COMPILE="$(host)-"
|
|
$(package)_config_opts_darwin += -device-option MAC_TARGET=$(host)
|
|
$(package)_config_opts_darwin += -device-option XCODE_VERSION=$(XCODE_VERSION)
|
|
endif
|
|
|
|
# for macOS on Apple Silicon (ARM) see https://bugreports.qt.io/browse/QTBUG-85279
|
|
$(package)_config_opts_aarch64_darwin += -device-option QMAKE_APPLE_DEVICE_ARCHS=arm64
|
|
|
|
$(package)_config_opts_linux = -qt-xcb
|
|
$(package)_config_opts_linux += -no-xcb-xlib
|
|
$(package)_config_opts_linux += -no-feature-xlib
|
|
$(package)_config_opts_linux += -system-freetype
|
|
$(package)_config_opts_linux += -fontconfig
|
|
$(package)_config_opts_linux += -no-opengl
|
|
$(package)_config_opts_linux += -no-feature-vulkan
|
|
$(package)_config_opts_linux += -no-feature-getentropy
|
|
$(package)_config_opts_linux += -no-feature-renameat2
|
|
$(package)_config_opts_linux += -dbus-runtime
|
|
$(package)_config_opts_arm_linux += -platform linux-g++ -xplatform bitcoin-linux-g++
|
|
$(package)_config_opts_i686_linux = -xplatform linux-g++-32
|
|
ifneq (,$(findstring -stdlib=libc++,$($(1)_cxx)))
|
|
$(package)_config_opts_x86_64_linux = -xplatform linux-clang-libc++
|
|
else
|
|
$(package)_config_opts_x86_64_linux = -xplatform linux-g++-64
|
|
endif
|
|
$(package)_config_opts_aarch64_linux = -xplatform linux-aarch64-gnu-g++
|
|
$(package)_config_opts_riscv64_linux = -platform linux-g++ -xplatform bitcoin-linux-g++
|
|
|
|
$(package)_config_opts_mingw32 = -no-opengl
|
|
$(package)_config_opts_mingw32 += -no-dbus
|
|
$(package)_config_opts_mingw32 += -xplatform win32-g++
|
|
$(package)_config_opts_mingw32 += "QMAKE_CFLAGS = '$($(package)_cflags) $($(package)_cppflags)'"
|
|
$(package)_config_opts_mingw32 += "QMAKE_CXXFLAGS = '$($(package)_cflags) $($(package)_cppflags)'"
|
|
$(package)_config_opts_mingw32 += "QMAKE_LFLAGS = '$($(package)_ldflags)'"
|
|
$(package)_config_opts_mingw32 += -device-option CROSS_COMPILE="$(host)-"
|
|
$(package)_config_opts_mingw32 += -pch
|
|
|
|
$(package)_config_opts_android = -xplatform android-clang
|
|
$(package)_config_opts_android += -android-sdk $(ANDROID_SDK)
|
|
$(package)_config_opts_android += -android-ndk $(ANDROID_NDK)
|
|
$(package)_config_opts_android += -android-ndk-platform android-$(ANDROID_API_LEVEL)
|
|
$(package)_config_opts_android += -device-option CROSS_COMPILE="$(host)-"
|
|
$(package)_config_opts_android += -egl
|
|
$(package)_config_opts_android += -qpa xcb
|
|
$(package)_config_opts_android += -no-eglfs
|
|
$(package)_config_opts_android += -no-dbus
|
|
$(package)_config_opts_android += -opengl es2
|
|
$(package)_config_opts_android += -qt-freetype
|
|
$(package)_config_opts_android += -no-fontconfig
|
|
$(package)_config_opts_android += -L $(host_prefix)/lib
|
|
$(package)_config_opts_android += -I $(host_prefix)/include
|
|
$(package)_config_opts_android += -pch
|
|
$(package)_config_opts_android += -no-feature-vulkan
|
|
|
|
$(package)_config_opts_aarch64_android += -android-arch arm64-v8a
|
|
$(package)_config_opts_armv7a_android += -android-arch armeabi-v7a
|
|
$(package)_config_opts_x86_64_android += -android-arch x86_64
|
|
$(package)_config_opts_i686_android += -android-arch i686
|
|
endef
|
|
|
|
define $(package)_fetch_cmds
|
|
$(call fetch_file,$(package),$($(package)_download_path),$($(package)_download_file),$($(package)_file_name),$($(package)_sha256_hash)) && \
|
|
$(call fetch_file,$(package),$($(package)_download_path),$($(package)_qttranslations_file_name),$($(package)_qttranslations_file_name),$($(package)_qttranslations_sha256_hash)) && \
|
|
$(call fetch_file,$(package),$($(package)_download_path),$($(package)_qttools_file_name),$($(package)_qttools_file_name),$($(package)_qttools_sha256_hash))
|
|
endef
|
|
|
|
define $(package)_extract_cmds
|
|
mkdir -p $($(package)_extract_dir) && \
|
|
echo "$($(package)_sha256_hash) $($(package)_source)" > $($(package)_extract_dir)/.$($(package)_file_name).hash && \
|
|
echo "$($(package)_qttranslations_sha256_hash) $($(package)_source_dir)/$($(package)_qttranslations_file_name)" >> $($(package)_extract_dir)/.$($(package)_file_name).hash && \
|
|
echo "$($(package)_qttools_sha256_hash) $($(package)_source_dir)/$($(package)_qttools_file_name)" >> $($(package)_extract_dir)/.$($(package)_file_name).hash && \
|
|
$(build_SHA256SUM) -c $($(package)_extract_dir)/.$($(package)_file_name).hash && \
|
|
mkdir qtbase && \
|
|
tar --no-same-owner --strip-components=1 -xf $($(package)_source) -C qtbase && \
|
|
mkdir qttranslations && \
|
|
tar --no-same-owner --strip-components=1 -xf $($(package)_source_dir)/$($(package)_qttranslations_file_name) -C qttranslations && \
|
|
mkdir qttools && \
|
|
tar --no-same-owner --strip-components=1 -xf $($(package)_source_dir)/$($(package)_qttools_file_name) -C qttools
|
|
endef
|
|
|
|
# Preprocessing steps work as follows:
|
|
#
|
|
# 1. Apply our patches to the extracted source. See each patch for more info.
|
|
#
|
|
# 2. Create a macOS-Clang-Linux mkspec using our mac-qmake.conf.
|
|
#
|
|
# 3. After making a copy of the mkspec for the linux-arm-gnueabi host, named
|
|
# bitcoin-linux-g++, replace instances of linux-arm-gnueabi with $(host). This
|
|
# way we can generically support hosts like riscv64-linux-gnu, which Qt doesn't
|
|
# ship a mkspec for. See it's usage in config_opts_* above.
|
|
#
|
|
# 4. Put our C, CXX and LD FLAGS into gcc-base.conf. Only used for non-host builds.
|
|
#
|
|
# 5. Do similar for the win32-g++ mkspec.
|
|
#
|
|
# 6. In clang.conf, swap out clang & clang++, for our compiler + flags. See #17466.
|
|
#
|
|
# 7. Adjust a regex in toolchain.prf, to accommodate Guix's usage of
|
|
# CROSS_LIBRARY_PATH. See #15277.
|
|
define $(package)_preprocess_cmds
|
|
cp $($(package)_patch_dir)/qt.pro qt.pro && \
|
|
cp $($(package)_patch_dir)/qttools_src.pro qttools/src/src.pro && \
|
|
patch -p1 -i $($(package)_patch_dir)/dont_hardcode_pwd.patch && \
|
|
patch -p1 -i $($(package)_patch_dir)/fix_qt_pkgconfig.patch && \
|
|
patch -p1 -i $($(package)_patch_dir)/fix_no_printer.patch && \
|
|
patch -p1 -i $($(package)_patch_dir)/fix_android_qmake_conf.patch && \
|
|
patch -p1 -i $($(package)_patch_dir)/fix_android_jni_static.patch && \
|
|
patch -p1 -i $($(package)_patch_dir)/fix_android_pch.patch && \
|
|
patch -p1 -i $($(package)_patch_dir)/no-xlib.patch && \
|
|
patch -p1 -i $($(package)_patch_dir)/no_sdk_version_check.patch && \
|
|
patch -p1 -i $($(package)_patch_dir)/fix_lib_paths.patch && \
|
|
patch -p1 -i $($(package)_patch_dir)/fix_limits_header.patch && \
|
|
patch -p1 -i $($(package)_patch_dir)/fix_montery_include.patch && \
|
|
patch -p1 -i $($(package)_patch_dir)/glibc_compatibility.patch && \
|
|
patch -p1 -i $($(package)_patch_dir)/qtbase-moc-ignore-gcc-macro.patch && \
|
|
mkdir -p qtbase/mkspecs/macx-clang-linux &&\
|
|
cp -f qtbase/mkspecs/macx-clang/qplatformdefs.h qtbase/mkspecs/macx-clang-linux/ &&\
|
|
cp -f $($(package)_patch_dir)/mac-qmake.conf qtbase/mkspecs/macx-clang-linux/qmake.conf && \
|
|
cp -r qtbase/mkspecs/linux-arm-gnueabi-g++ qtbase/mkspecs/bitcoin-linux-g++ && \
|
|
sed -i.old "s/arm-linux-gnueabi-/$(host)-/g" qtbase/mkspecs/bitcoin-linux-g++/qmake.conf && \
|
|
echo "!host_build: QMAKE_CFLAGS += $($(package)_cflags) $($(package)_cppflags)" >> qtbase/mkspecs/common/gcc-base.conf && \
|
|
echo "!host_build: QMAKE_CXXFLAGS += $($(package)_cxxflags) $($(package)_cppflags)" >> qtbase/mkspecs/common/gcc-base.conf && \
|
|
echo "!host_build: QMAKE_LFLAGS += $($(package)_ldflags)" >> qtbase/mkspecs/common/gcc-base.conf && \
|
|
sed -i.old "s|QMAKE_CC = \$$$$\$$$${CROSS_COMPILE}clang|QMAKE_CC = $($(package)_cc)|" qtbase/mkspecs/common/clang.conf && \
|
|
sed -i.old "s|QMAKE_CXX = \$$$$\$$$${CROSS_COMPILE}clang++|QMAKE_CXX = $($(package)_cxx)|" qtbase/mkspecs/common/clang.conf && \
|
|
sed -i.old "s/error(\"failed to parse default search paths from compiler output\")/\!darwin: error(\"failed to parse default search paths from compiler output\")/g" qtbase/mkspecs/features/toolchain.prf && \
|
|
sed -i.old "s/LIBRARY_PATH/(CROSS_)?\0/g" qtbase/mkspecs/features/toolchain.prf
|
|
endef
|
|
|
|
define $(package)_config_cmds
|
|
export PKG_CONFIG_SYSROOT_DIR=/ && \
|
|
export PKG_CONFIG_LIBDIR=$(host_prefix)/lib/pkgconfig && \
|
|
cd qtbase && \
|
|
./configure -top-level $($(package)_config_opts)
|
|
endef
|
|
|
|
define $(package)_build_cmds
|
|
$(MAKE)
|
|
endef
|
|
|
|
define $(package)_stage_cmds
|
|
$(MAKE) -C qtbase/src INSTALL_ROOT=$($(package)_staging_dir) $(addsuffix -install_subtargets,$(addprefix sub-,$($(package)_qt_libs))) && \
|
|
$(MAKE) -C qttools/src/linguist INSTALL_ROOT=$($(package)_staging_dir) $(addsuffix -install_subtargets,$(addprefix sub-,$($(package)_linguist_tools))) && \
|
|
$(MAKE) -C qttranslations INSTALL_ROOT=$($(package)_staging_dir) install_subtargets
|
|
endef
|
|
|
|
define $(package)_postprocess_cmds
|
|
rm -rf native/mkspecs/ native/lib/ lib/cmake/ && \
|
|
rm -f lib/lib*.la
|
|
endef
|