Skip to content

Commit

Permalink
debian: fix build by using rustup
Browse files Browse the repository at this point in the history
  • Loading branch information
R1kaB3rN committed Jan 1, 2025
1 parent 44ba978 commit d19345f
Show file tree
Hide file tree
Showing 3 changed files with 39 additions and 1 deletion.
37 changes: 37 additions & 0 deletions packaging/deb/debian/0001-debian-compile-using-latest-stable.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
From 20381cd1ae673bed6b11ca36ce7cc83ff8e7a794 Mon Sep 17 00:00:00 2001
From: R1kaB3rN <[email protected]>
Date: Wed, 1 Jan 2025 13:42:06 -0800
Subject: [PATCH] debian: compile using latest stable

---
Makefile.in | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/Makefile.in b/Makefile.in
index 03b18fc4..9631d2b4 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -3,6 +3,8 @@ PROJECT := umu-launcher
# Define the interpreters to use to prevent shebang complaints
PYTHON_INTERPRETER = /usr/bin/env python3

+SHELL_INTERPRETER = /usr/bin/env sh
+
# If this is changed to umu (uppercase), `uninstall` target will also remove the SLR directory
INSTALLDIR ?= umu

@@ -173,7 +175,10 @@ PYTHON_PLATFORM_TAG = $(shell $(PYTHON_INTERPRETER) -c 'import sysconfig; print(

$(OBJDIR)/.build-umu-delta: | $(OBJDIR)
$(info :: Building delta dependencies )
- cargo build -r
+ curl -LJO https://sh.rustup.rs
+ chmod u+x sh.rustup.rs
+ $(SHELL_INTERPRETER) sh.rustup.rs --default-toolchain stable -y
+ ./.cargo/bin/cargo build -r
cp -a ./target/release/libumu_delta.so $(OBJDIR)/umu_delta$(PYTHON_PLATFORM_TAG)

.PHONY: umu-delta
--
2.47.1

2 changes: 1 addition & 1 deletion packaging/deb/debian/control
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ Build-Depends:
python3-installer,
python3-build,
python3-pip,
cargo,
curl,
Standards-Version: 4.6.2
Homepage: https://github.com/Open-Wine-Components/umu-launcher
Vcs-Browser: https://github.com/Open-Wine-Components/umu-launcher
Expand Down
1 change: 1 addition & 0 deletions packaging/deb/debian/rules
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ PYTHONDIR = /usr/lib/python3/dist-packages
dh $@

override_dh_auto_configure:
patch -p1 < packaging/deb/debian/0001-debian-compile-using-latest-stable.patch
./configure.sh --prefix=/usr

override_dh_auto_build:
Expand Down

0 comments on commit d19345f

Please sign in to comment.