Ecosystem/feather
Ecosystem/feather
1
0
Fork 0
mirror of https://github.com/feather-wallet/feather.git synced 2025-01-18 16:54:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

depends: build qt with ninja

Browse source
This commit is contained in:
tobtoht 2023-05-27 21:26:43 +02:00
parent f236ceb75f
commit ecfcd728ce
No known key found for this signature in database
GPG key ID: E45B10DD027D2472
4 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
contrib/depends/packages/native_qt.mk
View file

@ -183,11 +183,10 @@ define $(package)_config_cmds
./configure -top-level $($(package)_config_opts) ./configure -top-level $($(package)_config_opts)
endef endef
# https://bugreports.qt.io/browse/QTBUG-112018
define $(package)_build_cmds define $(package)_build_cmds
export LD_LIBRARY_PATH=${build_prefix}/lib/ && \ export LD_LIBRARY_PATH=${build_prefix}/lib/ && \
unset CMAKE_PREFIX_PATH && \ unset CMAKE_PREFIX_PATH && \
$(MAKE) || $(MAKE) cmake --build . --parallel
endef endef
define $(package)_stage_cmds define $(package)_stage_cmds

9
contrib/depends/packages/qt.mk
View file

@ -180,7 +180,6 @@ $(package)_config_opts_mingw32 += -xplatform win32-g++
$(package)_config_opts_mingw32 += -device-option CROSS_COMPILE="$(host)-" $(package)_config_opts_mingw32 += -device-option CROSS_COMPILE="$(host)-"
$(package)_config_opts_mingw32 += -pch $(package)_config_opts_mingw32 += -pch
$(package)_config_opts_mingw32 += -qt-host-path $(build_prefix)/qt-host $(package)_config_opts_mingw32 += -qt-host-path $(build_prefix)/qt-host
$(package)_config_opts_mingw32 += -no-feature-ffmpeg
$(package)_config_opts_mingw32 += -wmf $(package)_config_opts_mingw32 += -wmf
$(package)_config_opts_mingw32 += -- -DCMAKE_TOOLCHAIN_FILE=WindowsToolchain.cmake -DCMAKE_LIBRARY_PATH=$(HOME)/.guix-profile/lib $(package)_config_opts_mingw32 += -- -DCMAKE_TOOLCHAIN_FILE=WindowsToolchain.cmake -DCMAKE_LIBRARY_PATH=$(HOME)/.guix-profile/lib
@ -312,23 +311,23 @@ endif
ifeq ($(host_os),darwin) ifeq ($(host_os),darwin)
define $(package)_build_cmds define $(package)_build_cmds
export LD_LIBRARY_PATH="${build_prefix}/lib/:$(QT_LIBS_LIBS)" && \ export LD_LIBRARY_PATH="${build_prefix}/lib/:$(QT_LIBS_LIBS)" && \
env -u C_INCLUDE_PATH -u CPLUS_INCLUDE_PATH -u OBJC_INCLUDE_PATH -u OBJCPLUS_INCLUDE_PATH -u CPATH -u LIBRARY_PATH $(MAKE) env -u C_INCLUDE_PATH -u CPLUS_INCLUDE_PATH -u OBJC_INCLUDE_PATH -u OBJCPLUS_INCLUDE_PATH -u CPATH -u LIBRARY_PATH cmake --build . --parallel
endef endef
else ifeq ($(host_os),mingw32) else ifeq ($(host_os),mingw32)
define $(package)_build_cmds define $(package)_build_cmds
export LD_LIBRARY_PATH="${build_prefix}/lib/:$(QT_LIBS_LIBS)" && \ export LD_LIBRARY_PATH="${build_prefix}/lib/:$(QT_LIBS_LIBS)" && \
$(MAKE) cmake --build . --parallel
endef endef
else ifneq (,$(findstring x86_64,$(HOST))) else ifneq (,$(findstring x86_64,$(HOST)))
define $(package)_build_cmds define $(package)_build_cmds
export LD_LIBRARY_PATH="${build_prefix}/lib/:$(QT_LIBS_LIBS)" && \ export LD_LIBRARY_PATH="${build_prefix}/lib/:$(QT_LIBS_LIBS)" && \
cmake --build . --target syncqt_build && \ cmake --build . --target syncqt_build && \
$(MAKE) cmake --build . --parallel
endef endef
else else
define $(package)_build_cmds define $(package)_build_cmds
export LD_LIBRARY_PATH="${build_prefix}/lib/:$(QT_LIBS_LIBS)" && \ export LD_LIBRARY_PATH="${build_prefix}/lib/:$(QT_LIBS_LIBS)" && \
$(MAKE) cmake --build . --parallel
endef endef
endif endif

4
contrib/depends/patches/qt/v4l2.patch
View file

@ -692,8 +692,8 @@ index 000000000..c07c0ebc7
+#ifdef Q_OS_DARWIN +#ifdef Q_OS_DARWIN
+#include "qavfcamera_p.h" +#include "qavfcamera_p.h"
+#elif defined(Q_OS_WINDOWS) +#elif defined(Q_OS_WINDOWS)
+#include "qwindowscamera_p.h" +#include "../windows/mediacapture/qwindowscamera_p.h"
+#include "qwindowsvideodevices_p.h" +#include "../windows/qwindowsvideodevices_p.h"
+#endif +#endif
+ +
+#if QT_CONFIG(linux_v4l) +#if QT_CONFIG(linux_v4l)

4
contrib/guix/manifest.scm
View file

@ -5,6 +5,7 @@
(gnu packages base) (gnu packages base)
(gnu packages bash) (gnu packages bash)
(gnu packages bison) (gnu packages bison)
(gnu packages build-tools)
(gnu packages certs) (gnu packages certs)
(gnu packages check) (gnu packages check)
(gnu packages cmake) (gnu packages cmake)
@ -25,6 +26,7 @@
(gnu packages llvm) (gnu packages llvm)
(gnu packages mingw) (gnu packages mingw)
(gnu packages moreutils) (gnu packages moreutils)
(gnu packages ninja)
(gnu packages perl) (gnu packages perl)
(gnu packages pkg-config) (gnu packages pkg-config)
(gnu packages python) (gnu packages python)
@ -321,6 +323,8 @@ chain for " target " development."))
gettext-minimal gettext-minimal
squashfs-tools squashfs-tools
cmake-minimal cmake-minimal
meson
ninja
;; Native GCC 10 toolchain ;; Native GCC 10 toolchain
gcc-toolchain-10 gcc-toolchain-10
(list gcc-toolchain-10 "static") (list gcc-toolchain-10 "static")