commit: d1b0a11d41e3b1e568d057be6414da5f1c078415 Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> AuthorDate: Thu Oct 11 21:28:21 2018 +0000 Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> CommitDate: Fri Oct 12 07:27:32 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d1b0a11d
dev-lang/mono: restore multilib support Dropped prebuilt binaries in tarball. Those were built for amd64. This caused x86 link failures. Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org> Package-Manager: Portage-2.3.51, Repoman-2.3.11 .../{mono-5.16.0.179.ebuild => mono-5.16.0.179-r1.ebuild} | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/dev-lang/mono/mono-5.16.0.179.ebuild b/dev-lang/mono/mono-5.16.0.179-r1.ebuild similarity index 89% rename from dev-lang/mono/mono-5.16.0.179.ebuild rename to dev-lang/mono/mono-5.16.0.179-r1.ebuild index 6179696890e..8c768a03719 100644 --- a/dev-lang/mono/mono-5.16.0.179.ebuild +++ b/dev-lang/mono/mono-5.16.0.179-r1.ebuild @@ -10,8 +10,7 @@ SLOT="0" IUSE="nls minimal pax_kernel xen doc" -#TODO: multilib-minimal support -inherit autotools eutils linux-info mono-env flag-o-matic pax-utils +inherit autotools eutils linux-info mono-env flag-o-matic pax-utils multilib-minimal DESCRIPTION="Mono runtime and class libraries, a C# compiler/interpreter" HOMEPAGE="http://www.mono-project.com/Main_Page" @@ -72,12 +71,17 @@ src_prepare() { # mono build system can fail otherwise strip-flags + # prebuilt files were left in tarball by accident: + rm -rv external/corefx/src/Native/Unix/System.Native/.libs || die + rm -rv external/corefx/src/Native/Unix/System.Native/*.{o,lo} || die + default # PATCHES contains configure.ac patch eautoreconf + multilib_copy_sources } -src_configure() { +multilib_src_configure() { local myeconfargs=( --disable-silent-rules $(use_with xen xen_opt) @@ -90,12 +94,12 @@ src_configure() { econf "${myeconfargs[@]}" } -src_test() { +multilib_src_test() { cd mcs/tests || die emake check } -src_install() { +multilib_src_install() { default_src_install # Remove files not respecting LDFLAGS and that we are not supposed to provide, see Fedora