guix: add x86 builds

diff --git a/contrib/depends/hosts/linux.mk b/contrib/depends/hosts/linux.mk
index 0ef699be9cab213ac86578b7f242923722051ddb..e098559737b2d92031b874731dbf3ba97d391a58 100644 (file)
--- a/contrib/depends/hosts/linux.mk
+++ b/contrib/depends/hosts/linux.mk
@@ -11,13 +11,6 @@ linux_debug_CXXFLAGS=$(linux_debug_CFLAGS)
 linux_debug_CPPFLAGS=-D_GLIBCXX_DEBUG -D_GLIBCXX_DEBUG_PEDANTIC -D_LIBCPP_DEBUG=1
 
 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_CXX=g++ -m64
 x86_64_linux_AR=ar
@@ -25,8 +18,6 @@ x86_64_linux_RANLIB=ranlib
 x86_64_linux_NM=nm
 x86_64_linux_STRIP=strip
 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_CXX=$(default_host_CXX) -m64
 endif

diff --git a/contrib/depends/packages/qt.mk b/contrib/depends/packages/qt.mk
index 81fbc4166fb7be58dabd276fe4b6c8450d8d1989..c657d289ff0177d38057e012c82f493982ee6cb7 100644 (file)
--- a/contrib/depends/packages/qt.mk
+++ b/contrib/depends/packages/qt.mk
@@ -20,6 +20,7 @@ $(package)_patches += xcb-util-image-fix.patch
 $(package)_patches += libxau-fix.patch
 $(package)_patches += toolchain.cmake
 $(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)_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_printsupport=no
 $(package)_config_opts += -DINPUT_sessionmanager=no
+$(package)_config_opts += -DINPUT_spatialaudio=no
 $(package)_config_opts += -DINPUT_sql=no
 $(package)_config_opts += -DINPUT_syntaxhighlighter=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 && \
   cd ../qtmultimedia && \
   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
 
 define $(package)_config_cmds

diff --git a/contrib/depends/patches/qt/no-resonance-audio.patch b/contrib/depends/patches/qt/no-resonance-audio.patch
new file mode 100644 (file)
index 0000000..d6cb225
--- /dev/null
+++ b/contrib/depends/patches/qt/no-resonance-audio.patch
@@ -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
+

diff --git a/contrib/guix/guix-build b/contrib/guix/guix-build
index af4c5773d830e71e1811f3fc691432faafc13dcb..93f624d3b934221f661fd9556ad18aa4720b220e 100755 (executable)
--- a/contrib/guix/guix-build
+++ b/contrib/guix/guix-build
@@ -79,7 +79,7 @@ mkdir -p "$VERSION_BASE"
 ################
 
 # 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.pack
                        riscv64-linux-gnu

diff --git a/contrib/guix/libexec/build.sh b/contrib/guix/libexec/build.sh
index b9e87e16a8b0f0327054489564f5eca3345a0816..0005a50b6ae19fda6799b40b672afcce176f979c 100755 (executable)
--- a/contrib/guix/libexec/build.sh
+++ b/contrib/guix/libexec/build.sh
@@ -175,6 +175,7 @@ case "$HOST" in
                 riscv64-linux-gnu)     echo /lib/ld-linux-riscv64-lp64d.so.1 ;;
                 powerpc64-linux-gnu)   echo /lib64/ld64.so.1;;
                 powerpc64le-linux-gnu) echo /lib64/ld64.so.2;;
+                i686-linux-gnu)        echo /lib/ld-linux.so.2 ;;
                 *)                     exit 1 ;;
             esac
         )