dev-scheme/ypsilon: fix build with GCC 11, un-last-rite

Thanks-to: Watcom <[email protected]> Bug: https://bugs.gentoo.org/730692 Closes: https://bugs.gentoo.org/787866 Signed-off-by: Sam James <[email protected]>
hanetzer · Aug 27, 2021 · f36a27d · f36a27d
1 parent db46d99
commit f36a27d
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 17 deletions.
diff --git a/dev-scheme/ypsilon/files/ypsilon-0.9.6_p3-asneeded.patch b/dev-scheme/ypsilon/files/ypsilon-0.9.6_p3-asneeded.patch
@@ -1,5 +1,5 @@
---- ypsilon-0.9.6.update3.orig/Makefile 2008-12-23 09:56:02.000000000 +0100
-+++ ypsilon-0.9.6.update3/Makefile 2009-10-21 18:14:37.613881129 +0200
+--- a/Makefile
++++ b/Makefile
 @@ -126,7 +126,7 @@
  @mkdir -p -m755 $(HOME)/.ypsilon
 

diff --git a/dev-scheme/ypsilon/ypsilon-0.9.6_p3.ebuild → ...scheme/ypsilon/ypsilon-0.9.6_p3-r1.ebuild b/dev-scheme/ypsilon/ypsilon-0.9.6_p3.ebuild → ...scheme/ypsilon/ypsilon-0.9.6_p3-r1.ebuild
@@ -1,14 +1,15 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit epatch flag-o-matic toolchain-funcs
+inherit flag-o-matic toolchain-funcs
 
 MY_P="${P/_p/.update}"
 DESCRIPTION="R6RS-compliant Scheme implementation for real-time applications"
 HOMEPAGE="https://code.google.com/p/ypsilon/"
 SRC_URI="https://ypsilon.googlecode.com/files/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
 
 LICENSE="BSD"
 SLOT="0"
@@ -18,21 +19,28 @@ IUSE="examples threads"
 DEPEND="app-arch/cpio"
 RDEPEND="${DEPEND}"
 
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-asneeded.patch
-}
+PATCHES=(
+ "${FILESDIR}"/${P}-asneeded.patch
+)
 
 src_compile() {
  use threads && append-flags "-pthread"
 
- emake PREFIX="/usr" CXX="$(tc-getCXX)" \
- CXXFLAGS="${CXXFLAGS}" LDFLAGS="$LDFLAGS"
+ # Fix build failure with GCC 11
+ # bug #787866
+ append-cppflags -DNO_TLS
+
+ emake \
+ PREFIX="${EPREFIX}/usr" \
+ CXX="$(tc-getCXX)" \
+ CPPFLAGS="${CPPFLAGS}" \
+ CXXFLAGS="${CXXFLAGS}" \
+ LDFLAGS="${LDFLAGS}"
 }
 
 src_install() {
- emake PREFIX="/usr" DESTDIR="${D}" install
+ emake PREFIX="${EPREFIX}/usr" DESTDIR="${D}" install
+
  if use examples; then
  insinto /usr/share/doc/${PF}/examples
  doins example/*

diff --git a/profiles/package.mask b/profiles/package.mask
@@ -156,11 +156,6 @@ app-eselect/eselect-audicle
 app-eselect/eselect-miniaudicle
 media-sound/audicle
 
-# Sam James <[email protected]> (2021-08-04)
-# Fails to build with GCC 11. No activity upstream since 2008.
-# bug #730692, bug #787866. Removal on 2021-09-04.
-dev-scheme/ypsilon
-
 # Sam James <[email protected]> (2021-08-04)
 # Fails to build with GCC 11. Library with no reverse-dependencies.
 # bug #731254, bug #787905. Removal on 2021-09-04.