Ecosystem/feather
Ecosystem/feather
1
0
Fork 0
mirror of https://github.com/feather-wallet/feather.git synced 2024-12-22 19:49:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

guix: add x86 builds

Browse source
This commit is contained in:
tobtoht 2023-12-10 14:33:29 +01:00
parent 414e8e774f
commit ff1b16564a
No known key found for this signature in database
GPG key ID: E45B10DD027D2472
5 changed files with 19 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
contrib/depends/hosts/linux.mk
View file

@ -11,13 +11,6 @@ linux_debug_CXXFLAGS=$(linux_debug_CFLAGS)
linux_debug_CPPFLAGS=-D_GLIBCXX_DEBUG -D_GLIBCXX_DEBUG_PEDANTIC -D_LIBCPP_DEBUG=1 linux_debug_CPPFLAGS=-D_GLIBCXX_DEBUG -D_GLIBCXX_DEBUG_PEDANTIC -D_LIBCPP_DEBUG=1
ifeq (86,$(findstring 86,$(build_arch))) ifeq (86,$(findstring 86,$(build_arch)))
i686_linux_CC=gcc -m32
i686_linux_CXX=g++ -m32
i686_linux_AR=ar
i686_linux_RANLIB=ranlib
i686_linux_NM=nm
i686_linux_STRIP=strip
x86_64_linux_CC=gcc -m64 x86_64_linux_CC=gcc -m64
x86_64_linux_CXX=g++ -m64 x86_64_linux_CXX=g++ -m64
x86_64_linux_AR=ar x86_64_linux_AR=ar
@ -25,8 +18,6 @@ x86_64_linux_RANLIB=ranlib
x86_64_linux_NM=nm x86_64_linux_NM=nm
x86_64_linux_STRIP=strip x86_64_linux_STRIP=strip
else else
i686_linux_CC=$(default_host_CC) -m32
i686_linux_CXX=$(default_host_CXX) -m32
x86_64_linux_CC=$(default_host_CC) -m64 x86_64_linux_CC=$(default_host_CC) -m64
x86_64_linux_CXX=$(default_host_CXX) -m64 x86_64_linux_CXX=$(default_host_CXX) -m64
endif endif

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

@ -20,6 +20,7 @@ $(package)_patches += xcb-util-image-fix.patch
$(package)_patches += libxau-fix.patch $(package)_patches += libxau-fix.patch
$(package)_patches += toolchain.cmake $(package)_patches += toolchain.cmake
$(package)_patches += revert-macOS-Silence-warning-about-supporting-secure.patch $(package)_patches += revert-macOS-Silence-warning-about-supporting-secure.patch
$(package)_patches += no-resonance-audio.patch
#$(package)_patches += fix-static-fontconfig-static-linking.patch #$(package)_patches += fix-static-fontconfig-static-linking.patch
$(package)_qttools_file_name=qttools-$($(package)_suffix) $(package)_qttools_file_name=qttools-$($(package)_suffix)
@ -93,6 +94,7 @@ $(package)_config_opts += -DINPUT_printpreviewdialog=no
$(package)_config_opts += -DINPUT_printpreviewwidget=no $(package)_config_opts += -DINPUT_printpreviewwidget=no
$(package)_config_opts += -DINPUT_printsupport=no $(package)_config_opts += -DINPUT_printsupport=no
$(package)_config_opts += -DINPUT_sessionmanager=no $(package)_config_opts += -DINPUT_sessionmanager=no
$(package)_config_opts += -DINPUT_spatialaudio=no
$(package)_config_opts += -DINPUT_sql=no $(package)_config_opts += -DINPUT_sql=no
$(package)_config_opts += -DINPUT_syntaxhighlighter=no $(package)_config_opts += -DINPUT_syntaxhighlighter=no
$(package)_config_opts += -DINPUT_textmarkdownwriter=no $(package)_config_opts += -DINPUT_textmarkdownwriter=no
@ -192,7 +194,8 @@ define $(package)_preprocess_cmds
patch -p1 -i $($(package)_patch_dir)/revert-macOS-Silence-warning-about-supporting-secure.patch && \ patch -p1 -i $($(package)_patch_dir)/revert-macOS-Silence-warning-about-supporting-secure.patch && \
cd ../qtmultimedia && \ cd ../qtmultimedia && \
patch -p1 -i $($(package)_patch_dir)/qtmultimedia-fixes.patch && \ patch -p1 -i $($(package)_patch_dir)/qtmultimedia-fixes.patch && \
patch -p1 -i $($(package)_patch_dir)/v4l2.patch patch -p1 -i $($(package)_patch_dir)/v4l2.patch && \
patch -p1 -i $($(package)_patch_dir)/no-resonance-audio.patch
endef endef
define $(package)_config_cmds define $(package)_config_cmds

13
contrib/depends/patches/qt/no-resonance-audio.patch Normal file
View file

@ -0,0 +1,13 @@
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -3,7 +3,6 @@
# Generated from src.pro.
-add_subdirectory(resonance-audio)
add_subdirectory(multimedia)
if(ANDROID)
add_subdirectory(android)
--
2.43.0

2
contrib/guix/guix-build
View file

@ -79,7 +79,7 @@ mkdir -p "$VERSION_BASE"
################ ################
# Default to building for all supported HOSTs (overridable by environment) # Default to building for all supported HOSTs (overridable by environment)
export HOSTS="${HOSTS:-x86_64-linux-gnu aarch64-linux-gnu arm-linux-gnueabihf export HOSTS="${HOSTS:-i686-linux-gnu x86_64-linux-gnu aarch64-linux-gnu arm-linux-gnueabihf
x86_64-linux-gnu.no-tor-bundle x86_64-linux-gnu.no-tor-bundle
x86_64-linux-gnu.pack x86_64-linux-gnu.pack
riscv64-linux-gnu riscv64-linux-gnu

1
contrib/guix/libexec/build.sh
View file

@ -175,6 +175,7 @@ case "$HOST" in
riscv64-linux-gnu) echo /lib/ld-linux-riscv64-lp64d.so.1 ;; riscv64-linux-gnu) echo /lib/ld-linux-riscv64-lp64d.so.1 ;;
powerpc64-linux-gnu) echo /lib64/ld64.so.1;; powerpc64-linux-gnu) echo /lib64/ld64.so.1;;
powerpc64le-linux-gnu) echo /lib64/ld64.so.2;; powerpc64le-linux-gnu) echo /lib64/ld64.so.2;;
i686-linux-gnu) echo /lib/ld-linux.so.2 ;;
*) exit 1 ;; *) exit 1 ;;
esac esac
) )