summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErik Mackdanz <stasibear@gentoo.org>2024-05-27 21:01:35 -0500
committerErik Mackdanz <stasibear@gentoo.org>2024-05-27 22:06:29 -0500
commit1bb6a03d98568d0f01507acfb41d0c47f494b155 (patch)
tree73a760965416c1ad40d5699f9758baae483c8fc8 /games-roguelike
parentdev-util/mk-configure: forward ~riscv ~x86 (diff)
downloadgentoo-1bb6a03d98568d0f01507acfb41d0c47f494b155.tar.gz
gentoo-1bb6a03d98568d0f01507acfb41d0c47f494b155.tar.bz2
gentoo-1bb6a03d98568d0f01507acfb41d0c47f494b155.zip
games-roguelike/stone-soup: fix doubled slash for install paths for musl
Closes: https://bugs.gentoo.org/929087 Signed-off-by: Erik Mackdanz <stasibear@gentoo.org>
Diffstat (limited to 'games-roguelike')
-rw-r--r--games-roguelike/stone-soup/files/make-v3.patch25
1 files changed, 18 insertions, 7 deletions
diff --git a/games-roguelike/stone-soup/files/make-v3.patch b/games-roguelike/stone-soup/files/make-v3.patch
index 7a1308b36bd6..19a308336cc3 100644
--- a/games-roguelike/stone-soup/files/make-v3.patch
+++ b/games-roguelike/stone-soup/files/make-v3.patch
@@ -1,5 +1,5 @@
---- a/Makefile 2023-04-08 18:39:09.818483802 -0500
-+++ b/Makefile 2023-04-08 18:44:54.509321177 -0500
+--- a/Makefile 2024-05-27 19:43:53.339479403 -0500
++++ b/Makefile 2024-05-27 19:45:08.737841222 -0500
@@ -206,7 +206,7 @@
uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not')
uname_M := $(shell sh -c 'uname -m 2>/dev/null || echo not')
@@ -82,16 +82,27 @@
WINARCH := $(shell $(GXX) -dumpmachine | grep -q x64_64 && echo win64 || echo win32)
export SRC_VERSION
-@@ -1644,7 +1630,7 @@
+@@ -1645,13 +1631,13 @@
$(COPY) dat/tiles/stone_soup_icon-512x512.png $(prefix_fp)/share/icons/hicolor/512x512/apps/$(XDG_NAME).png
$(COPY) dat/tiles/stone_soup_icon.svg $(prefix_fp)/share/icons/hicolor/scalable/apps/$(XDG_NAME).svg
-install: all install-data
+- [ -d $(prefix_fp)/$(bin_prefix) ] || mkdir -p $(prefix_fp)/$(bin_prefix)
+- $(COPY) $(GAME) $(prefix_fp)/$(bin_prefix)/
+- $(STRIP) $(prefix_fp)/$(bin_prefix)/$(GAME)
+install: install-data
- [ -d $(prefix_fp)/$(bin_prefix) ] || mkdir -p $(prefix_fp)/$(bin_prefix)
- $(COPY) $(GAME) $(prefix_fp)/$(bin_prefix)/
- $(STRIP) $(prefix_fp)/$(bin_prefix)/$(GAME)
-@@ -1901,9 +1887,6 @@
++ [ -d $(prefix_fp)$(bin_prefix) ] || mkdir -p $(prefix_fp)$(bin_prefix)
++ $(COPY) $(GAME) $(prefix_fp)$(bin_prefix)/
++ $(STRIP) $(prefix_fp)$(bin_prefix)/$(GAME)
+ ifeq ($(USE_DGAMELAUNCH),)
+- $(CHOWN) $(INSTALL_UGRP) $(prefix_fp)/$(bin_prefix)/$(GAME) || true
+- $(CHMOD) $(MCHMOD) $(prefix_fp)/$(bin_prefix)/$(GAME) || true
++ $(CHOWN) $(INSTALL_UGRP) $(prefix_fp)$(bin_prefix)/$(GAME) || true
++ $(CHMOD) $(MCHMOD) $(prefix_fp)$(bin_prefix)/$(GAME) || true
+ endif
+
+ clean: clean-rltiles clean-webserver clean-android clean-monster clean-catch2 \
+@@ -1905,9 +1891,6 @@
dat/tiles/%.png: $(RLTILES)/%.png
$(QUIET_PNGCRUSH)$(PNGCRUSH) $< $@