1 |
commit: 687d699e1b6392decd2dad1fb8966ddb62323708 |
2 |
Author: Jan Ziak <0xe2.0x9a.0x9b <AT> gmail <DOT> com> |
3 |
AuthorDate: Tue Jul 28 15:30:54 2020 +0000 |
4 |
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Aug 16 08:00:57 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=687d699e |
7 |
|
8 |
app-emulation/libspectrum: avoid /usr/lib in the link command line |
9 |
|
10 |
Closes: https://bugs.gentoo.org/734184 |
11 |
Signed-off-by: Jan Ziak <0xe2.0x9a.0x9b <AT> gmail.com> |
12 |
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org> |
13 |
|
14 |
.../libspectrum/files/remove-local-prefix.patch | 18 ++++++++++++++++++ |
15 |
app-emulation/libspectrum/libspectrum-1.4.4.ebuild | 11 +++++++++++ |
16 |
2 files changed, 29 insertions(+) |
17 |
|
18 |
diff --git a/app-emulation/libspectrum/files/remove-local-prefix.patch b/app-emulation/libspectrum/files/remove-local-prefix.patch |
19 |
new file mode 100644 |
20 |
index 00000000000..23e2b5dd041 |
21 |
--- /dev/null |
22 |
+++ b/app-emulation/libspectrum/files/remove-local-prefix.patch |
23 |
@@ -0,0 +1,18 @@ |
24 |
+diff -Naur libspectrum-1.4.4/configure.ac libspectrum-1.4.4-patched/configure.ac |
25 |
+--- libspectrum-1.4.4/configure.ac 2018-07-01 02:07:44.000000000 +0200 |
26 |
++++ libspectrum-1.4.4-patched/configure.ac 2020-07-28 16:38:22.636459194 +0200 |
27 |
+@@ -113,14 +113,6 @@ |
28 |
+ dnl Check for functions |
29 |
+ AC_CHECK_FUNCS(_snprintf _stricmp _strnicmp snprintf strcasecmp strncasecmp) |
30 |
+ |
31 |
+-dnl Allow the user to say that various libraries are in one place |
32 |
+-AC_ARG_WITH(local-prefix, |
33 |
+-[ --with-local-prefix=PFX local libraries installed in PFX (optional)], |
34 |
+-CPPFLAGS="$CPPFLAGS -I$withval/include"; LDFLAGS="$LDFLAGS -L$withval/lib", |
35 |
+-if test "$prefix" != "NONE"; then |
36 |
+- CPPFLAGS="$CPPFLAGS -I$prefix/include"; LDFLAGS="$LDFLAGS -L$prefix/lib" |
37 |
+-fi) |
38 |
+- |
39 |
+ dnl Check whether to use zlib (the UNIX version is called z, Win32 zdll) |
40 |
+ AC_MSG_CHECKING(whether to use zlib) |
41 |
+ AC_ARG_WITH(zlib, |
42 |
|
43 |
diff --git a/app-emulation/libspectrum/libspectrum-1.4.4.ebuild b/app-emulation/libspectrum/libspectrum-1.4.4.ebuild |
44 |
index 7d6cd415f46..f830494fd23 100644 |
45 |
--- a/app-emulation/libspectrum/libspectrum-1.4.4.ebuild |
46 |
+++ b/app-emulation/libspectrum/libspectrum-1.4.4.ebuild |
47 |
@@ -3,6 +3,8 @@ |
48 |
|
49 |
EAPI=6 |
50 |
|
51 |
+inherit autotools |
52 |
+ |
53 |
DESCRIPTION="Spectrum emulation library" |
54 |
HOMEPAGE="http://fuse-emulator.sourceforge.net/libspectrum.php" |
55 |
SRC_URI="mirror://sourceforge/fuse-emulator/${P}.tar.gz" |
56 |
@@ -21,6 +23,15 @@ DEPEND="${RDEPEND} |
57 |
dev-lang/perl |
58 |
virtual/pkgconfig" |
59 |
|
60 |
+PATCHES=( |
61 |
+ "${FILESDIR}"/remove-local-prefix.patch |
62 |
+) |
63 |
+ |
64 |
+src_prepare() { |
65 |
+ default |
66 |
+ eautoreconf |
67 |
+} |
68 |
+ |
69 |
src_configure() { |
70 |
local myconf=( |
71 |
--disable-static |