From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 78B9113835A for ; Sun, 16 Aug 2020 08:01:25 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 38BD3E0826; Sun, 16 Aug 2020 08:01:24 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 1A24AE0824 for ; Sun, 16 Aug 2020 08:01:24 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 8413B34F36E for ; Sun, 16 Aug 2020 08:01:22 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B05CC320 for ; Sun, 16 Aug 2020 08:01:19 +0000 (UTC) From: "Joonas Niilola" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Joonas Niilola" Message-ID: <1597564857.687d699e1b6392decd2dad1fb8966ddb62323708.juippis@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/libspectrum/, app-emulation/libspectrum/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-emulation/libspectrum/files/remove-local-prefix.patch app-emulation/libspectrum/libspectrum-1.4.4.ebuild X-VCS-Directories: app-emulation/libspectrum/ app-emulation/libspectrum/files/ X-VCS-Committer: juippis X-VCS-Committer-Name: Joonas Niilola X-VCS-Revision: 687d699e1b6392decd2dad1fb8966ddb62323708 X-VCS-Branch: master Date: Sun, 16 Aug 2020 08:01:19 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 2b032397-f1db-45eb-ac66-4ef7d693ea78 X-Archives-Hash: a15d5eab5446d32d8c3e7e74d7de62df commit: 687d699e1b6392decd2dad1fb8966ddb62323708 Author: Jan Ziak <0xe2.0x9a.0x9b gmail com> AuthorDate: Tue Jul 28 15:30:54 2020 +0000 Commit: Joonas Niilola gentoo org> CommitDate: Sun Aug 16 08:00:57 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=687d699e app-emulation/libspectrum: avoid /usr/lib in the link command line Closes: https://bugs.gentoo.org/734184 Signed-off-by: Jan Ziak <0xe2.0x9a.0x9b gmail.com> Signed-off-by: Joonas Niilola gentoo.org> .../libspectrum/files/remove-local-prefix.patch | 18 ++++++++++++++++++ app-emulation/libspectrum/libspectrum-1.4.4.ebuild | 11 +++++++++++ 2 files changed, 29 insertions(+) diff --git a/app-emulation/libspectrum/files/remove-local-prefix.patch b/app-emulation/libspectrum/files/remove-local-prefix.patch new file mode 100644 index 00000000000..23e2b5dd041 --- /dev/null +++ b/app-emulation/libspectrum/files/remove-local-prefix.patch @@ -0,0 +1,18 @@ +diff -Naur libspectrum-1.4.4/configure.ac libspectrum-1.4.4-patched/configure.ac +--- libspectrum-1.4.4/configure.ac 2018-07-01 02:07:44.000000000 +0200 ++++ libspectrum-1.4.4-patched/configure.ac 2020-07-28 16:38:22.636459194 +0200 +@@ -113,14 +113,6 @@ + dnl Check for functions + AC_CHECK_FUNCS(_snprintf _stricmp _strnicmp snprintf strcasecmp strncasecmp) + +-dnl Allow the user to say that various libraries are in one place +-AC_ARG_WITH(local-prefix, +-[ --with-local-prefix=PFX local libraries installed in PFX (optional)], +-CPPFLAGS="$CPPFLAGS -I$withval/include"; LDFLAGS="$LDFLAGS -L$withval/lib", +-if test "$prefix" != "NONE"; then +- CPPFLAGS="$CPPFLAGS -I$prefix/include"; LDFLAGS="$LDFLAGS -L$prefix/lib" +-fi) +- + dnl Check whether to use zlib (the UNIX version is called z, Win32 zdll) + AC_MSG_CHECKING(whether to use zlib) + AC_ARG_WITH(zlib, diff --git a/app-emulation/libspectrum/libspectrum-1.4.4.ebuild b/app-emulation/libspectrum/libspectrum-1.4.4.ebuild index 7d6cd415f46..f830494fd23 100644 --- a/app-emulation/libspectrum/libspectrum-1.4.4.ebuild +++ b/app-emulation/libspectrum/libspectrum-1.4.4.ebuild @@ -3,6 +3,8 @@ EAPI=6 +inherit autotools + DESCRIPTION="Spectrum emulation library" HOMEPAGE="http://fuse-emulator.sourceforge.net/libspectrum.php" SRC_URI="mirror://sourceforge/fuse-emulator/${P}.tar.gz" @@ -21,6 +23,15 @@ DEPEND="${RDEPEND} dev-lang/perl virtual/pkgconfig" +PATCHES=( + "${FILESDIR}"/remove-local-prefix.patch +) + +src_prepare() { + default + eautoreconf +} + src_configure() { local myconf=( --disable-static