| 1 |
commit: f18190f1c6a974bb606e30c3b0d0f71dd041f391 |
| 2 |
Author: Alexey Sokolov <alexey+gentoo <AT> asokolov <DOT> org> |
| 3 |
AuthorDate: Tue Sep 7 20:49:32 2021 +0000 |
| 4 |
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Sep 8 00:03:13 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f18190f1 |
| 7 |
|
| 8 |
games-engines/scummvm-tools: Fix build without native symlinks |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/744424 |
| 11 |
Package-Manager: Portage-3.0.20, Repoman-3.0.3 |
| 12 |
Signed-off-by: Alexey Sokolov <alexey+gentoo <AT> asokolov.org> |
| 13 |
Closes: https://github.com/gentoo/gentoo/pull/22228 |
| 14 |
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org> |
| 15 |
|
| 16 |
.../files/scummvm-tools-2.2.0-strings.patch | 17 +++++++++++++++++ |
| 17 |
games-engines/scummvm-tools/scummvm-tools-2.2.0.ebuild | 13 +++++-------- |
| 18 |
2 files changed, 22 insertions(+), 8 deletions(-) |
| 19 |
|
| 20 |
diff --git a/games-engines/scummvm-tools/files/scummvm-tools-2.2.0-strings.patch b/games-engines/scummvm-tools/files/scummvm-tools-2.2.0-strings.patch |
| 21 |
new file mode 100644 |
| 22 |
index 00000000000..1bd3f9f399d |
| 23 |
--- /dev/null |
| 24 |
+++ b/games-engines/scummvm-tools/files/scummvm-tools-2.2.0-strings.patch |
| 25 |
@@ -0,0 +1,17 @@ |
| 26 |
+Fix build without native symlinks |
| 27 |
+https://bugs.gentoo.org/744424 |
| 28 |
+ |
| 29 |
+--- a/configure |
| 30 |
++++ b/configure |
| 31 |
+@@ -1026,9 +1026,9 @@ void _ebcdic() { char* s = (char*) ebcdi |
| 32 |
+ int main() { _ascii (); _ebcdic (); return 0; } |
| 33 |
+ EOF |
| 34 |
+ $CXX $CXXFLAGS -c -o $TMPO.o tmp_endianness_check.cpp |
| 35 |
+-if strings $TMPO.o | grep BIGenDianSyS >/dev/null; then |
| 36 |
++if ${STRINGS} $TMPO.o | grep BIGenDianSyS >/dev/null; then |
| 37 |
+ _endian=big |
| 38 |
+-elif strings $TMPO.o | grep LiTTleEnDian >/dev/null; then |
| 39 |
++elif ${STRINGS} $TMPO.o | grep LiTTleEnDian >/dev/null; then |
| 40 |
+ _endian=little |
| 41 |
+ fi |
| 42 |
+ echo $_endian; |
| 43 |
|
| 44 |
diff --git a/games-engines/scummvm-tools/scummvm-tools-2.2.0.ebuild b/games-engines/scummvm-tools/scummvm-tools-2.2.0.ebuild |
| 45 |
index c514a09b8b7..3af45ddd2fa 100644 |
| 46 |
--- a/games-engines/scummvm-tools/scummvm-tools-2.2.0.ebuild |
| 47 |
+++ b/games-engines/scummvm-tools/scummvm-tools-2.2.0.ebuild |
| 48 |
@@ -1,7 +1,7 @@ |
| 49 |
# Copyright 1999-2021 Gentoo Authors |
| 50 |
# Distributed under the terms of the GNU General Public License v2 |
| 51 |
|
| 52 |
-EAPI=7 |
| 53 |
+EAPI=8 |
| 54 |
|
| 55 |
WX_GTK_VER=3.0-gtk3 |
| 56 |
inherit wxwidgets toolchain-funcs |
| 57 |
@@ -17,7 +17,7 @@ IUSE="flac iconv mad png vorbis" |
| 58 |
RESTRICT="test" # some tests require external files |
| 59 |
|
| 60 |
RDEPEND=" |
| 61 |
- >=dev-libs/boost-1.32:= |
| 62 |
+ dev-libs/boost:= |
| 63 |
sys-libs/zlib |
| 64 |
x11-libs/wxGTK:${WX_GTK_VER} |
| 65 |
flac? ( media-libs/flac ) |
| 66 |
@@ -35,17 +35,18 @@ BDEPEND=" |
| 67 |
|
| 68 |
PATCHES=( |
| 69 |
"${FILESDIR}/${PN}-1.8.0-binprefix.patch" |
| 70 |
+ "${FILESDIR}/${PN}-2.2.0-strings.patch" |
| 71 |
) |
| 72 |
|
| 73 |
src_prepare() { |
| 74 |
default |
| 75 |
|
| 76 |
- rm -rf *.bat dists/win32 || die |
| 77 |
- sed -ri -e '/^(CC|CXX)\b/d' Makefile || die |
| 78 |
+ rm -r *.bat dists/win32 || die |
| 79 |
} |
| 80 |
|
| 81 |
src_configure() { |
| 82 |
setup-wxwidgets |
| 83 |
+ tc-export CXX STRINGS |
| 84 |
|
| 85 |
# Not an autoconf script |
| 86 |
./configure \ |
| 87 |
@@ -61,10 +62,6 @@ src_configure() { |
| 88 |
$(use_enable vorbis) || die |
| 89 |
} |
| 90 |
|
| 91 |
-src_compile() { |
| 92 |
- emake STRINGS="$(tc-getSTRINGS)" |
| 93 |
-} |
| 94 |
- |
| 95 |
src_install() { |
| 96 |
EXEPREFIX="${PN}-" default |
| 97 |
} |
Archives