diff --git a/depends/Makefile b/depends/Makefile index c63277f091b9..92cfb001c211 100644 --- a/depends/Makefile +++ b/depends/Makefile @@ -211,6 +211,7 @@ $(host_prefix)/.stamp_$(final_build_id): $(native_packages) $(packages) echo copying packages: $^ echo to: $(@D) cd $(@D); $(foreach package,$^, $(build_TAR) xf $($(package)_cached); ) + echo To build Dash Core with these packages, pass \'--toolchain $(@D)/toolchain.cmake\' to the first CMake invocation. touch $@ ifeq ($(host),$(build)) @@ -222,6 +223,7 @@ endif $(host_prefix)/toolchain.cmake : toolchain.cmake.in $(host_prefix)/.stamp_$(final_build_id) @mkdir -p $(@D) sed -e 's|@depends_crosscompiling@|$(crosscompiling)|' \ + -e 's|@host@|$(host)|' \ -e 's|@host_system_name@|$($(host_os)_cmake_system_name)|' \ -e 's|@host_system_version@|$($(host_os)_cmake_system_version)|' \ -e 's|@host_arch@|$(host_arch)|' \ @@ -233,7 +235,6 @@ $(host_prefix)/toolchain.cmake : toolchain.cmake.in $(host_prefix)/.stamp_$(fina -e 's|@STRIP@|$(host_STRIP)|' \ -e 's|@OBJCOPY@|$(host_OBJCOPY)|' \ -e 's|@OBJDUMP@|$(host_OBJDUMP)|' \ - -e 's|@depends_prefix@|$(host_prefix)|' \ -e 's|@CFLAGS@|$(strip $(host_CFLAGS))|' \ -e 's|@CFLAGS_RELEASE@|$(strip $(host_release_CFLAGS))|' \ -e 's|@CFLAGS_DEBUG@|$(strip $(host_debug_CFLAGS))|' \ diff --git a/depends/funcs.mk b/depends/funcs.mk index db09a2819110..0be61b148656 100644 --- a/depends/funcs.mk +++ b/depends/funcs.mk @@ -180,13 +180,15 @@ $(1)_cmake=env CC="$$($(1)_cc)" \ CXX="$$($(1)_cxx)" \ CXXFLAGS="$$($(1)_cppflags) $$($(1)_cxxflags)" \ LDFLAGS="$$($(1)_ldflags)" \ - cmake -DCMAKE_INSTALL_PREFIX:PATH="$$($($(1)_type)_prefix)" \ + cmake -G "Unix Makefiles" \ + -DCMAKE_INSTALL_PREFIX:PATH="$$($($(1)_type)_prefix)" \ -DCMAKE_AR=`which $$($(1)_ar)` \ -DCMAKE_NM=`which $$($(1)_nm)` \ -DCMAKE_RANLIB=`which $$($(1)_ranlib)` \ -DCMAKE_INSTALL_LIBDIR=lib/ \ -DCMAKE_POSITION_INDEPENDENT_CODE=ON \ -DCMAKE_VERBOSE_MAKEFILE:BOOL=$(V) \ + -DCMAKE_EXPORT_NO_PACKAGE_REGISTRY:BOOL=TRUE \ $$($(1)_config_opts) ifeq ($($(1)_type),build) $(1)_cmake += -DCMAKE_INSTALL_RPATH:PATH="$$($($(1)_type)_prefix)/lib" @@ -241,6 +243,10 @@ $($(1)_staged): | $($(1)_built) $($(1)_postprocessed): | $($(1)_staged) echo Postprocessing $(1)... cd $($(1)_staging_prefix_dir); $($(1)_postprocess_cmds) + cd $($(1)_staging_prefix_dir); \ + for pc in $$$$(find lib/pkgconfig share/pkgconfig -name '*.pc' 2>/dev/null); do \ + sed -e 's|$($($(1)_type)_prefix)|$$$${pcfiledir}/../..|g' "$$$$pc" > "$$$$pc.tmp" && mv "$$$$pc.tmp" "$$$$pc"; \ + done touch $$@ $($(1)_cached): | $($(1)_dependencies) $($(1)_postprocessed) echo Caching $(1)... diff --git a/depends/hosts/default.mk b/depends/hosts/default.mk index b0f907f13db0..be4d9c564bb0 100644 --- a/depends/hosts/default.mk +++ b/depends/hosts/default.mk @@ -9,6 +9,7 @@ default_host_RANLIB = $(host_toolchain)ranlib default_host_STRIP = $(host_toolchain)strip default_host_NM = $(host_toolchain)nm default_host_OBJCOPY = $(host_toolchain)objcopy +default_host_OBJDUMP = $(host_toolchain)objdump define add_host_tool_func ifneq ($(filter $(origin $1),undefined default),) diff --git a/depends/packages/fontconfig.mk b/depends/packages/fontconfig.mk index 6baaecc55a76..bd20d7c9ff77 100644 --- a/depends/packages/fontconfig.mk +++ b/depends/packages/fontconfig.mk @@ -29,5 +29,5 @@ define $(package)_stage_cmds endef define $(package)_postprocess_cmds - rm -rf var lib/*.la + rm -rf bin etc share var lib/*.la endef diff --git a/depends/packages/qt.mk b/depends/packages/qt.mk index a6742b9ef9c9..740e027c28f3 100644 --- a/depends/packages/qt.mk +++ b/depends/packages/qt.mk @@ -11,7 +11,6 @@ $(package)_linguist_tools = lrelease lupdate lconvert $(package)_patches = qt.pro $(package)_patches += qttools_src.pro $(package)_patches += mac-qmake.conf -$(package)_patches += fix_qt_pkgconfig.patch $(package)_patches += no-xlib.patch $(package)_patches += dont_hardcode_pwd.patch $(package)_patches += qtbase-moc-ignore-gcc-macro.patch @@ -65,6 +64,7 @@ $(package)_config_opts += -no-mimetype-database $(package)_config_opts += -no-mtdev $(package)_config_opts += -no-openssl $(package)_config_opts += -no-openvg +$(package)_config_opts += -no-pkg-config $(package)_config_opts += -no-reduce-relocations $(package)_config_opts += -no-schannel $(package)_config_opts += -no-sctp @@ -85,7 +85,6 @@ $(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 @@ -226,7 +225,6 @@ 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)/no-xlib.patch && \ patch -p1 -i $($(package)_patch_dir)/qtbase-moc-ignore-gcc-macro.patch && \ patch -p1 -i $($(package)_patch_dir)/memory_resource.patch && \ @@ -274,6 +272,6 @@ define $(package)_stage_cmds endef define $(package)_postprocess_cmds - rm -rf doc/ native/lib/ && \ - rm -f lib/lib*.la + rm -rf doc/ native/lib/ lib/pkgconfig/ && \ + rm -f lib/lib*.la lib/Qt5*.la endef diff --git a/depends/packages/sqlite.mk b/depends/packages/sqlite.mk index 15bc0f4d7a3c..025176dfca5e 100644 --- a/depends/packages/sqlite.mk +++ b/depends/packages/sqlite.mk @@ -31,5 +31,6 @@ define $(package)_stage_cmds endef define $(package)_postprocess_cmds + rm -rf lib/pkgconfig && \ rm lib/*.la endef diff --git a/depends/patches/qt/fix_qt_pkgconfig.patch b/depends/patches/qt/fix_qt_pkgconfig.patch deleted file mode 100644 index 73f4d89f7354..000000000000 --- a/depends/patches/qt/fix_qt_pkgconfig.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- old/qtbase/mkspecs/features/qt_module.prf -+++ new/qtbase/mkspecs/features/qt_module.prf -@@ -269,7 +269,7 @@ load(qt_installs) - load(qt_targets) - - # this builds on top of qt_common --!internal_module:if(unix|mingw):!if(darwin:debug_and_release:CONFIG(debug, debug|release)) { -+if(unix|mingw):!if(darwin:debug_and_release:CONFIG(debug, debug|release)) { - CONFIG += create_pc - QMAKE_PKGCONFIG_DESTDIR = pkgconfig - host_build: \ diff --git a/depends/toolchain.cmake.in b/depends/toolchain.cmake.in index 818416913616..b678bb319727 100644 --- a/depends/toolchain.cmake.in +++ b/depends/toolchain.cmake.in @@ -13,6 +13,10 @@ if(@depends_crosscompiling@) set(CMAKE_SYSTEM_NAME @host_system_name@) set(CMAKE_SYSTEM_VERSION @host_system_version@) set(CMAKE_SYSTEM_PROCESSOR @host_arch@) + + set(CMAKE_C_COMPILER_TARGET @host@) + set(CMAKE_CXX_COMPILER_TARGET @host@) + set(CMAKE_OBJCXX_COMPILER_TARGET @host@) endif() if(NOT DEFINED CMAKE_C_FLAGS_INIT) @@ -81,12 +85,12 @@ set(CMAKE_OBJDUMP "@OBJDUMP@") # affected by a potentially random environment. set(CMAKE_FIND_USE_CMAKE_ENVIRONMENT_PATH OFF) -set(CMAKE_FIND_ROOT_PATH "@depends_prefix@") +set(CMAKE_FIND_ROOT_PATH "${CMAKE_CURRENT_LIST_DIR}") set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY) set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY) -set(QT_TRANSLATIONS_DIR "@depends_prefix@/translations") +set(QT_TRANSLATIONS_DIR "${CMAKE_CURRENT_LIST_DIR}/translations") if(CMAKE_SYSTEM_NAME STREQUAL "Darwin" AND NOT CMAKE_HOST_APPLE) # The find_package(Qt ...) function internally uses find_library() @@ -106,71 +110,64 @@ set(PKG_CONFIG_ARGN --static) # Set configuration options for the main build system. -set(qt_packages @qt_packages@) -if("${qt_packages}" STREQUAL "") +# The depends/Makefile can generate values with "not-set" +# semantics as empty strings or strings containing only spaces. +# Therefore, MATCHES must be used rather than STREQUAL. +if("@qt_packages@" MATCHES "^[ ]*$") set(BUILD_GUI OFF CACHE BOOL "") else() set(BUILD_GUI ON CACHE BOOL "") endif() -set(qrencode_packages @qrencode_packages@) -if("${qrencode_packages}" STREQUAL "") +if("@qrencode_packages@" MATCHES "^[ ]*$") set(WITH_QRENCODE OFF CACHE BOOL "") else() set(WITH_QRENCODE ON CACHE BOOL "") endif() -set(zmq_packages @zmq_packages@) -if("${zmq_packages}" STREQUAL "") +if("@zmq_packages@" MATCHES "^[ ]*$") set(WITH_ZMQ OFF CACHE BOOL "") else() set(WITH_ZMQ ON CACHE BOOL "") endif() -set(zstd_packages @zstd_packages@) -if("${zstd_packages}" STREQUAL "") +if("@zstd_packages@" MATCHES "^[ ]*$") set(WITH_ZSTD OFF CACHE BOOL "") else() set(WITH_ZSTD ON CACHE BOOL "") endif() -set(wallet_packages @wallet_packages@) -if("${wallet_packages}" STREQUAL "") +if("@wallet_packages@" MATCHES "^[ ]*$") set(ENABLE_WALLET OFF CACHE BOOL "") else() set(ENABLE_WALLET ON CACHE BOOL "") endif() -set(bdb_packages @bdb_packages@) -if("${wallet_packages}" STREQUAL "" OR "${bdb_packages}" STREQUAL "") +if("@wallet_packages@" MATCHES "^[ ]*$" OR "@bdb_packages@" MATCHES "^[ ]*$") set(WITH_BDB OFF CACHE BOOL "") else() set(WITH_BDB ON CACHE BOOL "") endif() -set(sqlite_packages @sqlite_packages@) -if("${wallet_packages}" STREQUAL "" OR "${sqlite_packages}" STREQUAL "") +if("@wallet_packages@" MATCHES "^[ ]*$" OR "@sqlite_packages@" MATCHES "^[ ]*$") set(WITH_SQLITE OFF CACHE BOOL "") else() set(WITH_SQLITE ON CACHE BOOL "") endif() -set(upnp_packages @upnp_packages@) -if("${upnp_packages}" STREQUAL "") +if("@upnp_packages@" MATCHES "^[ ]*$") set(WITH_MINIUPNPC OFF CACHE BOOL "") else() set(WITH_MINIUPNPC ON CACHE BOOL "") endif() -set(natpmp_packages @natpmp_packages@) -if("${natpmp_packages}" STREQUAL "") +if("@natpmp_packages@" MATCHES "^[ ]*$") set(WITH_NATPMP OFF CACHE BOOL "") else() set(WITH_NATPMP ON CACHE BOOL "") endif() -set(usdt_packages @usdt_packages@) -if("${usdt_packages}" STREQUAL "") +if("@usdt_packages@" MATCHES "^[ ]*$") set(WITH_USDT OFF CACHE BOOL "") else() set(WITH_USDT ON CACHE BOOL "")