diff options
Diffstat (limited to 'media-libs/resid')
| -rw-r--r-- | media-libs/resid/Manifest | 3 | ||||
| -rw-r--r-- | media-libs/resid/files/resid-0.16_p2-drop-CXXFLAGS-override.patch | 24 | ||||
| -rw-r--r-- | media-libs/resid/resid-0.16_p2-r1.ebuild | 29 |
3 files changed, 41 insertions, 15 deletions
diff --git a/media-libs/resid/Manifest b/media-libs/resid/Manifest index fcde318150ba..f2de6ce0e303 100644 --- a/media-libs/resid/Manifest +++ b/media-libs/resid/Manifest @@ -1,3 +1,4 @@ +AUX resid-0.16_p2-drop-CXXFLAGS-override.patch 735 BLAKE2B d2e742d785752ce5cbca248b33ae50780b4623f6aae8757e9de548b323b38bb2ee8c56a4624ba65bb2ade61a0933ee9a42fc66baa600b995827e55492d84499d SHA512 a4ad17fc1aaa0e9b07103eafc18be9ccce7f13cb6fc21cb0e74e512382db7ce603ea29696d2f5328c7e3f67818626314c4275e58167052b913508bab89d4dd9d DIST resid-0.16-p2.tgz 329919 BLAKE2B 00f93b13351ec6387579755ad2b6b44394d6a1d2f2c0a6077e581db01628e84c07e6707b7c8b580492989adc8b5a5f89de670792b38bf2d8037b4abb22f88c2d SHA512 f7e86e97ea6d17c3e75b7763974b1182b49b2498c5fd3c1b0665c026ea6473cda3f9fc70bc123ac1357034879e3caaf41279d2253a8122246dc7e1c70c063d09 -EBUILD resid-0.16_p2-r1.ebuild 917 BLAKE2B 9af50cb66a8a88d84f1951fe5cdc300e902b9224ae80b9ac15fcc87a166d09528d87c5c1b8cc517d25ef0f8ed6499f3cae582cc47f2fbc3960d3717ef49420f4 SHA512 991451f9108b1e7edd8d8ed70dc17e888e88de3d6c8d953567ae2e2cd66a085c3ed6bb7e3b051ad1918791168cd0b8c65c948dec03d8c591e313af696dc8891a +EBUILD resid-0.16_p2-r1.ebuild 917 BLAKE2B 13a21768a1b2a2abaaac7547c7c821dcc873b623f65846aa4af0b956b31fa8a9cb0fc1f3bec9da474a443093646637824551e470ee50da367dd5179867e933b0 SHA512 172f88d9b8e8839041d780e0201a89f4b43b7b596ce76d706dc4100accfe687836c581d832a854afb0175656e6a73b90c6e2e5bd9a08a5fe171ab96b68986c87 MISC metadata.xml 331 BLAKE2B 41bbcd40272e97e1e0b10fd8e9471db6bfa393ac15eead124bd6e5885b1a35d746bd5be4ced94ed97d31ea130ed17aee55f81b6582e1895813661e3cf07e55b6 SHA512 83c0e6c0f4c7a85a10c96db7cb2eadffab0ef5e4614b0a091a4e14bb9a37b90d0d509bec47bf75d03853ab39a06ca12bcb5cd89f89e09901340a76c7b5c392e8 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 000000000000..f116c1d6f8b9 --- /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 339518007976..6959ad0f820c 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-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 -inherit autotools eutils 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 } |