| 1 |
commit: c36a73546fb51cf33dcdd1fab2444d4da239665f |
| 2 |
Author: Jan Ziak <0xe2.0x9a.0x9b <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Tue Jul 28 15:32:04 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=c36a7354 |
| 7 |
|
| 8 |
app-emulation/fuse: avoid /usr/lib in the link command line |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/734182 |
| 11 |
Signed-off-by: Jan Ziak <0xe2.0x9a.0x9b <AT> gmail.com> |
| 12 |
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org> |
| 13 |
|
| 14 |
app-emulation/fuse/files/remove-local-prefix.patch | 18 ++++++++++++++++++ |
| 15 |
app-emulation/fuse/fuse-1.5.6.ebuild | 13 ++++++++++++- |
| 16 |
app-emulation/fuse/fuse-1.5.7.ebuild | 13 ++++++++++++- |
| 17 |
3 files changed, 42 insertions(+), 2 deletions(-) |
| 18 |
|
| 19 |
diff --git a/app-emulation/fuse/files/remove-local-prefix.patch b/app-emulation/fuse/files/remove-local-prefix.patch |
| 20 |
new file mode 100644 |
| 21 |
index 00000000000..61bf33a1adc |
| 22 |
--- /dev/null |
| 23 |
+++ b/app-emulation/fuse/files/remove-local-prefix.patch |
| 24 |
@@ -0,0 +1,18 @@ |
| 25 |
+diff -Naur fuse-1.5.7/configure.ac fuse-1.5.7-patched/configure.ac |
| 26 |
+--- fuse-1.5.7/configure.ac 2018-12-09 13:06:11.000000000 +0100 |
| 27 |
++++ fuse-1.5.7-patched/configure.ac 2020-07-28 17:02:33.678546857 +0200 |
| 28 |
+@@ -110,14 +110,6 @@ |
| 29 |
+ AX_STRINGS_STRCASECMP |
| 30 |
+ fi |
| 31 |
+ |
| 32 |
+-dnl Allow the user to say that various libraries are in one place |
| 33 |
+-AC_ARG_WITH(local-prefix, |
| 34 |
+-[ --with-local-prefix=PFX local libraries installed in PFX (optional)], |
| 35 |
+-CPPFLAGS="$CPPFLAGS -I$withval/include"; LDFLAGS="$LDFLAGS -L$withval/lib", |
| 36 |
+-if test "$prefix" != "NONE"; then |
| 37 |
+- CPPFLAGS="$CPPFLAGS -I$prefix/include"; LDFLAGS="$LDFLAGS -L$prefix/lib" |
| 38 |
+-fi) |
| 39 |
+- |
| 40 |
+ dnl Check that libspectrum is available and that it is new enough |
| 41 |
+ PKG_CHECK_MODULES([LIBSPECTRUM], [libspectrum >= 1.4.0]) |
| 42 |
+ |
| 43 |
|
| 44 |
diff --git a/app-emulation/fuse/fuse-1.5.6.ebuild b/app-emulation/fuse/fuse-1.5.6.ebuild |
| 45 |
index 0e1754ea079..ffc3cfaeb97 100644 |
| 46 |
--- a/app-emulation/fuse/fuse-1.5.6.ebuild |
| 47 |
+++ b/app-emulation/fuse/fuse-1.5.6.ebuild |
| 48 |
@@ -1,8 +1,10 @@ |
| 49 |
-# Copyright 1999-2018 Gentoo Authors |
| 50 |
+# Copyright 1999-2020 Gentoo Authors |
| 51 |
# Distributed under the terms of the GNU General Public License v2 |
| 52 |
|
| 53 |
EAPI=6 |
| 54 |
|
| 55 |
+inherit autotools |
| 56 |
+ |
| 57 |
DESCRIPTION="Free Unix Spectrum Emulator by Philip Kendall" |
| 58 |
HOMEPAGE="http://fuse-emulator.sourceforge.net" |
| 59 |
SRC_URI="mirror://sourceforge/fuse-emulator/${P}.tar.gz" |
| 60 |
@@ -35,6 +37,15 @@ DEPEND="${RDEPEND} |
| 61 |
|
| 62 |
DOCS=( AUTHORS ChangeLog README THANKS ) |
| 63 |
|
| 64 |
+PATCHES=( |
| 65 |
+ "${FILESDIR}"/remove-local-prefix.patch |
| 66 |
+) |
| 67 |
+ |
| 68 |
+src_prepare() { |
| 69 |
+ default |
| 70 |
+ eautoreconf |
| 71 |
+} |
| 72 |
+ |
| 73 |
src_configure() { |
| 74 |
local myconf=( |
| 75 |
--without-win32 |
| 76 |
|
| 77 |
diff --git a/app-emulation/fuse/fuse-1.5.7.ebuild b/app-emulation/fuse/fuse-1.5.7.ebuild |
| 78 |
index 0e1754ea079..ffc3cfaeb97 100644 |
| 79 |
--- a/app-emulation/fuse/fuse-1.5.7.ebuild |
| 80 |
+++ b/app-emulation/fuse/fuse-1.5.7.ebuild |
| 81 |
@@ -1,8 +1,10 @@ |
| 82 |
-# Copyright 1999-2018 Gentoo Authors |
| 83 |
+# Copyright 1999-2020 Gentoo Authors |
| 84 |
# Distributed under the terms of the GNU General Public License v2 |
| 85 |
|
| 86 |
EAPI=6 |
| 87 |
|
| 88 |
+inherit autotools |
| 89 |
+ |
| 90 |
DESCRIPTION="Free Unix Spectrum Emulator by Philip Kendall" |
| 91 |
HOMEPAGE="http://fuse-emulator.sourceforge.net" |
| 92 |
SRC_URI="mirror://sourceforge/fuse-emulator/${P}.tar.gz" |
| 93 |
@@ -35,6 +37,15 @@ DEPEND="${RDEPEND} |
| 94 |
|
| 95 |
DOCS=( AUTHORS ChangeLog README THANKS ) |
| 96 |
|
| 97 |
+PATCHES=( |
| 98 |
+ "${FILESDIR}"/remove-local-prefix.patch |
| 99 |
+) |
| 100 |
+ |
| 101 |
+src_prepare() { |
| 102 |
+ default |
| 103 |
+ eautoreconf |
| 104 |
+} |
| 105 |
+ |
| 106 |
src_configure() { |
| 107 |
local myconf=( |
| 108 |
--without-win32 |
Archives