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 69BC01382C5 for ; Sun, 25 Apr 2021 19:13:51 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C5484E08BD; Sun, 25 Apr 2021 19:13:50 +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 ACC29E08BD for ; Sun, 25 Apr 2021 19:13:50 +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 9C2F833E6A3 for ; Sun, 25 Apr 2021 19:13:49 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6F116634 for ; Sun, 25 Apr 2021 19:13:47 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1619378008.c5f139342e7f865b7b34c73208475cfca491603a.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/resid/files/, media-libs/resid/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/resid/files/resid-0.16_p2-drop-CXXFLAGS-override.patch media-libs/resid/resid-0.16_p2-r1.ebuild X-VCS-Directories: media-libs/resid/files/ media-libs/resid/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: c5f139342e7f865b7b34c73208475cfca491603a X-VCS-Branch: master Date: Sun, 25 Apr 2021 19:13:47 +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: 90ea099b-ae53-49e2-94e1-2376ece9a416 X-Archives-Hash: 13cc09db634b6437c410b195ee5ea5e8 commit: c5f139342e7f865b7b34c73208475cfca491603a Author: Sam James gentoo org> AuthorDate: Sun Apr 25 18:25:24 2021 +0000 Commit: Sam James gentoo org> CommitDate: Sun Apr 25 19:13:28 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c5f13934 media-libs/resid: port to EAPI 7, drop ltpune, drop static-libs, etc * Port to EAPI 7 * Drop ltprune.eclass * Drop static-libs * Respect CXXFLAGS (couldn't reproduce but the problem was obvious) * Fix out of source builds (just turn it back on!) Closes: https://bugs.gentoo.org/775767 Signed-off-by: Sam James gentoo.org> .../resid-0.16_p2-drop-CXXFLAGS-override.patch | 24 +++++++++++++++++++ media-libs/resid/resid-0.16_p2-r1.ebuild | 27 +++++++++++----------- 2 files changed, 38 insertions(+), 13 deletions(-) diff --git a/media-libs/resid/files/resid-0.16_p2-drop-CXXFLAGS-override.patch b/media-libs/resid/files/resid-0.16_p2-drop-CXXFLAGS-override.patch new file mode 100644 index 00000000000..f116c1d6f8b --- /dev/null +++ b/media-libs/resid/files/resid-0.16_p2-drop-CXXFLAGS-override.patch @@ -0,0 +1,24 @@ +--- a/configure.in ++++ b/configure.in +@@ -26,20 +26,6 @@ AC_SUBST(RESID_INLINE) + dnl Checks for programs. + AC_PROG_CXX + +-dnl Set CXXFLAGS for g++. Use -fno-exceptions if supported. +-if test "$GXX" = yes; then +- if test "$ac_test_CXXFLAGS" != set; then +- CXXFLAGS="-g -Wall -O2 -funroll-loops -fomit-frame-pointer -fno-exceptions" +- AC_MSG_CHECKING([whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works]) +- AC_TRY_COMPILE([], +- [int test;], +- [ AC_MSG_RESULT(yes) ], +- [ AC_MSG_RESULT(no) +- CXXFLAGS="-g -Wall -O2 -funroll-loops -fomit-frame-pointer" +- ]) +- fi +-fi +- + AC_PATH_PROG(PERL, perl) + + dnl Checks for libraries. +-- diff --git a/media-libs/resid/resid-0.16_p2-r1.ebuild b/media-libs/resid/resid-0.16_p2-r1.ebuild index eeb9c6d81ad..6959ad0f820 100644 --- a/media-libs/resid/resid-0.16_p2-r1.ebuild +++ b/media-libs/resid/resid-0.16_p2-r1.ebuild @@ -1,39 +1,38 @@ # Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 -inherit autotools ltprune multilib-minimal versionator +EAPI=7 -MY_MAJ=$(get_version_component_range 1-2) +inherit autotools multilib-minimal + +MY_MAJ=$(ver_cut 1-2) DESCRIPTION="C++ library to emulate the C64 SID chip" HOMEPAGE="http://sidplay2.sourceforge.net" SRC_URI="mirror://sourceforge/sidplay2/${P/_p/-p}.tgz" +S="${WORKDIR}"/${PN}-${MY_MAJ} LICENSE="GPL-2" SLOT="0" KEYWORDS="~alpha amd64 ppc sparc x86" -IUSE="static-libs" - -S=${WORKDIR}/${PN}-${MY_MAJ} -DOCS=( - AUTHORS ChangeLog NEWS README THANKS TODO VC_CC_SUPPORT.txt +PATCHES=( + "${FILESDIR}"/${PN}-0.16_p2-drop-CXXFLAGS-override.patch ) src_prepare() { default + mv configure.{in,ac} || die + # This is required, otherwise the shared libraries get installed as # libresid.0.0.0 instead of libresid.so.0.0.0. eautoreconf - - multilib_copy_sources } multilib_src_configure() { - econf \ - $(use_enable static-libs static) \ + ECONF_SOURCE="${S}" econf \ + --disable-static \ --enable-resid-install \ --enable-shared } @@ -41,5 +40,7 @@ multilib_src_configure() { multilib_src_install() { default - prune_libtool_files + dodoc "${S}"/VC_CC_SUPPORT.txt + + find "${ED}" -name '*.la' -delete || die }