Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/aranym/, app-emulation/aranym/files/
Date: Sun, 19 Mar 2023 02:10:43
Message-Id: 1679191662.a668ea238de52ded7e15f83b837b476646496438.sam@gentoo
1 commit: a668ea238de52ded7e15f83b837b476646496438
2 Author: Sam James <sam <AT> gentoo <DOT> org>
3 AuthorDate: Sun Mar 19 02:07:25 2023 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Sun Mar 19 02:07:42 2023 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a668ea23
7
8 app-emulation/aranym: fix configure w/ non-bash
9
10 Signed-off-by: Sam James <sam <AT> gentoo.org>
11
12 app-emulation/aranym/aranym-1.1.0-r1.ebuild | 1 +
13 .../files/aranym-1.1.0-configure-bashisms.patch | 37 ++++++++++++++++++++++
14 2 files changed, 38 insertions(+)
15
16 diff --git a/app-emulation/aranym/aranym-1.1.0-r1.ebuild b/app-emulation/aranym/aranym-1.1.0-r1.ebuild
17 index 6746e9ba4b47..3b4f4ca886c8 100644
18 --- a/app-emulation/aranym/aranym-1.1.0-r1.ebuild
19 +++ b/app-emulation/aranym/aranym-1.1.0-r1.ebuild
20 @@ -42,6 +42,7 @@ PATCHES=(
21 "${FILESDIR}"/${PN}-1.1.0-ar.patch
22 "${FILESDIR}"/${PN}-1.1.0-clang-16-register.patch
23 "${FILESDIR}"/${PN}-1.1.0-configure-clang16.patch
24 + "${FILESDIR}"/${PN}-1.1.0-configure-bashisms.patch
25 )
26
27 ECONF_SOURCE="${S}"
28
29 diff --git a/app-emulation/aranym/files/aranym-1.1.0-configure-bashisms.patch b/app-emulation/aranym/files/aranym-1.1.0-configure-bashisms.patch
30 new file mode 100644
31 index 000000000000..f2a453095a52
32 --- /dev/null
33 +++ b/app-emulation/aranym/files/aranym-1.1.0-configure-bashisms.patch
34 @@ -0,0 +1,37 @@
35 +https://github.com/aranym/aranym/pull/102
36 +
37 +From 1a45b77ee2eaabc53fef0794c0e3a64a7c41683e Mon Sep 17 00:00:00 2001
38 +From: Sam James <sam@g.o>
39 +Date: Sun, 19 Mar 2023 02:05:09 +0000
40 +Subject: [PATCH] configure.ac: fix bashisms
41 +
42 +configure scripts need to be runnable with a POSIX-compliant /bin/sh.
43 +
44 +On many (but not all!) systems, /bin/sh is provided by Bash, so errors
45 +like this aren't spotted. Notably Debian defaults to /bin/sh provided
46 +by dash which doesn't tolerate such bashisms as '=='.
47 +
48 +This retains compatibility with bash.
49 +--- a/configure.ac
50 ++++ b/configure.ac
51 +@@ -1714,7 +1714,7 @@ SDL_CFLAGS=
52 + SDL_LIBS=
53 + no_sdl=yes
54 + no_sdl2=yes
55 +-if test "$OS_TYPE" == darwin -a "$WITH_FINK" = no; then
56 ++if test "$OS_TYPE" = darwin -a "$WITH_FINK" = no; then
57 + ARANYM_CHECK_FRAMEWORK(SDL, [])
58 + if test "$have_framework_SDL" = yes ; then
59 + ARANYM_CHECK_FRAMEWORK_LOCATION(SDL)
60 +@@ -1781,7 +1781,7 @@ SDL_LIBS="$SDL_LIBS -lpthread"
61 + AM_CONDITIONAL([ENABLE_SDL2], test "$enable_sdl2" = yes)
62 + #
63 + # SDL2 on macOS needs 10.6 or above
64 +-if test "$enable_sdl2" = yes -a "$OS_TYPE" == darwin; then
65 ++if test "$enable_sdl2" = yes -a "$OS_TYPE" = darwin; then
66 + export MACOSX_DEPLOYMENT_TARGET=10.6
67 + fi
68 +
69 +--
70 +2.40.0
71 +