[packages/gnome-robots] - handle x32 build

qboosh qboosh at pld-linux.org
Fri Dec 27 21:40:03 CET 2024


commit 55f8a3aef58cc5a20d36cf5a6fc7637a57de3a46
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Fri Dec 27 21:33:08 2024 +0100

    - handle x32 build

 gnome-robots-x32.patch | 18 ++++++++++++++++++
 gnome-robots.spec      | 10 ++++++++++
 2 files changed, 28 insertions(+)
---
diff --git a/gnome-robots.spec b/gnome-robots.spec
index d91ae6e..8ec3c61 100644
--- a/gnome-robots.spec
+++ b/gnome-robots.spec
@@ -10,6 +10,7 @@ Source0:	https://download.gnome.org/sources/gnome-robots/41/%{name}-%{version}.t
 # Source0-md5:	150d940aa6f8d8267ed62144dbe5b899
 Source1:	%{name}-%{version}-vendor.tar.xz
 # Source1-md5:	9ca0e4a67c0646ba3c759438218327bd
+Patch0:		%{name}-x32.patch
 URL:		https://wiki.gnome.org/Apps/Robots
 BuildRequires:	appstream-glib
 BuildRequires:	cargo
@@ -51,6 +52,9 @@ powodowaniu, żeby zderzały się ze sobą wzajemnie.
 
 %prep
 %setup -q -b1
+%ifarch x32
+%patch -P0 -p1
+%endif
 
 # use offline registry
 CARGO_HOME="$(pwd)/.cargo"
@@ -65,6 +69,9 @@ directory = '$PWD/vendor'
 EOF
 
 %build
+%ifarch x32
+export PKG_CONFIG_ALLOW_CROSS=1
+%endif
 %meson build
 
 %ninja_build -C build
@@ -72,6 +79,9 @@ EOF
 %install
 rm -rf $RPM_BUILD_ROOT
 
+%ifarch x32
+export PKG_CONFIG_ALLOW_CROSS=1
+%endif
 %ninja_install -C build
 
 %find_lang %{name} --with-gnome
diff --git a/gnome-robots-x32.patch b/gnome-robots-x32.patch
new file mode 100644
index 0000000..e0ccc3f
--- /dev/null
+++ b/gnome-robots-x32.patch
@@ -0,0 +1,18 @@
+--- gnome-robots-41.1/src/meson.build.orig	2024-12-25 13:06:26.000000000 +0100
++++ gnome-robots-41.1/src/meson.build	2024-12-27 21:04:53.631954328 +0100
+@@ -11,6 +11,7 @@ run_command(
+ )
+ 
+ cargo_options = [ '--manifest-path', meson.project_source_root() / 'Cargo.toml' ]
++cargo_options += [ '--target', 'x86_64-unknown-linux-gnux32' ]
+ cargo_options += [ '--target-dir', meson.project_build_root() / 'src' ]
+ 
+ if profile == 'debug'
+@@ -38,6 +39,6 @@ custom_target(
+         cargo_env,
+         cargo, 'build', cargo_options,
+         '&&',
+-        'cp', 'src' / rust_target / meson.project_name(), '@OUTPUT@',
++        'cp', 'src' / 'x86_64-unknown-linux-gnux32' / rust_target / meson.project_name(), '@OUTPUT@',
+     ]
+ )
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/gnome-robots.git/commitdiff/55f8a3aef58cc5a20d36cf5a6fc7637a57de3a46



More information about the pld-cvs-commit mailing list