commit:     99d34f88dcb8a1d465e476497c127039dcc17f0b
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 30 01:33:47 2016 +0000
Commit:     Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Wed Nov 30 02:11:48 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=99d34f88

dev-lang/mono: make kernel config checking not need a kernel to be installed

Change to linux_chkconfig_builtin as the value can only be 'y' and even if the
kernel config value could be 'm' we don't have a way of checking if it is
loaded.

Package-Manager: portage-2.3.0

 dev-lang/mono/mono-4.6.1.5-r1.ebuild   | 119 ++++++++++++++++++++++++++++++++
 dev-lang/mono/mono-4.9.0.729-r1.ebuild | 120 +++++++++++++++++++++++++++++++++
 2 files changed, 239 insertions(+)

diff --git a/dev-lang/mono/mono-4.6.1.5-r1.ebuild 
b/dev-lang/mono/mono-4.6.1.5-r1.ebuild
new file mode 100644
index 00000000..9232a04
--- /dev/null
+++ b/dev-lang/mono/mono-4.6.1.5-r1.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit eutils linux-info mono-env flag-o-matic pax-utils versionator 
multilib-minimal
+
+DESCRIPTION="Mono runtime and class libraries, a C# compiler/interpreter"
+HOMEPAGE="http://www.mono-project.com/Main_Page";
+SRC_URI="http://download.mono-project.com/sources/${PN}/${P}.tar.bz2";
+
+LICENSE="MIT LGPL-2.1 GPL-2 BSD-4 NPL-1.1 Ms-PL GPL-2-with-linking-exception 
IDPL"
+SLOT="0"
+
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux"
+
+IUSE="nls minimal pax_kernel xen doc"
+
+COMMONDEPEND="
+       !minimal? ( >=dev-dotnet/libgdiplus-2.10 )
+       ia64? ( sys-libs/libunwind )
+       nls? ( sys-devel/gettext )
+"
+RDEPEND="${COMMONDEPEND}
+       || ( www-client/links www-client/lynx )
+"
+DEPEND="${COMMONDEPEND}
+       sys-devel/bc
+       virtual/yacc
+       pax_kernel? ( sys-apps/elfix )
+       !dev-lang/mono-basic
+"
+
+S="${WORKDIR}/${PN}-$(get_version_component_range 1-3)"
+
+pkg_pretend() {
+       linux-info_pkg_setup
+       if use kernel_linux; then
+               if linux_config_exists; then
+                       linux_chkconfig_builtin SYSVIPC || die "SYSVIPC not 
enabled in the kernel"
+               else
+                       # 
https://github.com/gentoo/gentoo/blob/f200e625bda8de696a28338318c9005b69e34710/eclass/linux-info.eclass#L686
+                       ewarn "kernel config not found"
+                       ewarn "If CONFIG_SYSVIPC is not set in your kernel 
.config, mono will hang while compiling."
+                       ewarn "See http://bugs.gentoo.org/261869 for more info."
+               fi
+       fi
+}
+
+pkg_setup() {
+       mono-env_pkg_setup
+}
+
+src_prepare() {
+       # we need to sed in the paxctl-ng -mr in the runtime/mono-wrapper.in so 
it don't
+       # get killed in the build proces when MPROTECT is enable. #286280
+       # RANDMMAP kill the build proces to #347365
+       # use paxmark.sh to get PT/XT logic #532244
+       if use pax_kernel ; then
+               ewarn "We are disabling MPROTECT on the mono binary."
+
+               # issue 9 : https://github.com/Heather/gentoo-dotnet/issues/9
+               sed '/exec "/ i\paxmark.sh -mr "$r/@mono_runtime@"' -i 
"${S}"/runtime/mono-wrapper.in || die "Failed to sed mono-wrapper.in"
+       fi
+
+       # mono build system can fail otherwise
+       strip-flags
+
+       # Fix VB targets
+       # http://osdir.com/ml/general/2015-05/msg20808.html
+       #eapply "${FILESDIR}/add_missing_vb_portable_targets.patch"
+
+       # Fix build when sgen disabled
+       # https://bugzilla.xamarin.com/show_bug.cgi?id=32015
+       #eapply 
"${FILESDIR}/${PN}-4.0.2.5-fix-mono-dis-makefile-am-when-without-sgen.patch"
+
+       # TODO: update patch
+       # Fix atomic_add_i4 support for 32-bit ppc
+       # 
https://github.com/mono/mono/compare/f967c79926900343f399c75624deedaba460e544^...8f379f0c8f98493180b508b9e68b9aa76c0c5bdf
+       #epatch "${FILESDIR}/${PN}-4.0.2.5-fix-ppc-atomic-add-i4.patch"
+
+       # TODO: update patch
+       #epatch "${FILESDIR}/systemweb3.patch"
+       #epatch 
"${FILESDIR}/fix-for-GitExtensions-issue-2710-another-resolution.patch"
+       #epatch "${FILESDIR}/fix-for-bug36724.patch"
+
+       default
+       #eapply_user
+       multilib_copy_sources
+}
+
+multilib_src_configure() {
+       local myeconfargs=(
+               --disable-silent-rules
+               $(use_with xen xen_opt)
+               --without-ikvm-native
+               --disable-dtrace
+               $(use_with doc mcs-docs)
+               $(use_enable nls)
+       )
+
+       econf "${myeconfargs[@]}"
+}
+
+multilib_src_test() {
+       cd mcs/tests || die
+       emake check
+}
+
+multilib_src_install() {
+       default_src_install
+
+       # Remove files not respecting LDFLAGS and that we are not supposed to 
provide, see Fedora
+       # mono.spec and 
http://www.mail-archive.com/[email protected]/msg24870.html
+       # for reference.
+       rm -f "${ED}"/usr/lib/mono/{2.0,4.5}/mscorlib.dll.so || die
+       rm -f "${ED}"/usr/lib/mono/{2.0,4.5}/mcs.exe.so || die
+}

diff --git a/dev-lang/mono/mono-4.9.0.729-r1.ebuild 
b/dev-lang/mono/mono-4.9.0.729-r1.ebuild
new file mode 100644
index 00000000..b97f86a
--- /dev/null
+++ b/dev-lang/mono/mono-4.9.0.729-r1.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit eutils linux-info mono-env flag-o-matic pax-utils versionator 
multilib-minimal
+
+DESCRIPTION="Mono runtime and class libraries, a C# compiler/interpreter"
+HOMEPAGE="http://www.mono-project.com/Main_Page";
+SRC_URI="http://download.mono-project.com/sources/${PN}/nightly/${P}.tar.bz2";
+
+LICENSE="MIT LGPL-2.1 GPL-2 BSD-4 NPL-1.1 Ms-PL GPL-2-with-linking-exception 
IDPL"
+SLOT="0"
+
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux"
+
+IUSE="nls minimal pax_kernel xen doc"
+
+COMMONDEPEND="
+       !minimal? ( >=dev-dotnet/libgdiplus-2.10 )
+       ia64? ( sys-libs/libunwind )
+       nls? ( sys-devel/gettext )
+"
+RDEPEND="${COMMONDEPEND}
+       || ( www-client/links www-client/lynx )
+"
+DEPEND="${COMMONDEPEND}
+       sys-devel/bc
+       virtual/yacc
+       pax_kernel? ( sys-apps/elfix )
+       dev-util/cmake
+       !dev-lang/mono-basic
+"
+
+S="${WORKDIR}/${PN}-$(get_version_component_range 1-3)"
+
+pkg_pretend() {
+       linux-info_pkg_setup
+       if use kernel_linux; then
+               if linux_config_exists; then
+                       linux_chkconfig_builtin SYSVIPC || die "SYSVIPC not 
enabled in the kernel"
+               else
+                       # 
https://github.com/gentoo/gentoo/blob/f200e625bda8de696a28338318c9005b69e34710/eclass/linux-info.eclass#L686
+                       ewarn "kernel config not found"
+                       ewarn "If CONFIG_SYSVIPC is not set in your kernel 
.config, mono will hang while compiling."
+                       ewarn "See http://bugs.gentoo.org/261869 for more info."
+               fi
+       fi
+}
+
+pkg_setup() {
+       mono-env_pkg_setup
+}
+
+src_prepare() {
+       # we need to sed in the paxctl-ng -mr in the runtime/mono-wrapper.in so 
it don't
+       # get killed in the build proces when MPROTECT is enable. #286280
+       # RANDMMAP kill the build proces to #347365
+       # use paxmark.sh to get PT/XT logic #532244
+       if use pax_kernel ; then
+               ewarn "We are disabling MPROTECT on the mono binary."
+
+               # issue 9 : https://github.com/Heather/gentoo-dotnet/issues/9
+               sed '/exec "/ i\paxmark.sh -mr "$r/@mono_runtime@"' -i 
"${S}"/runtime/mono-wrapper.in || die "Failed to sed mono-wrapper.in"
+       fi
+
+       # mono build system can fail otherwise
+       strip-flags
+
+       # Fix VB targets
+       # http://osdir.com/ml/general/2015-05/msg20808.html
+       #eapply "${FILESDIR}/add_missing_vb_portable_targets.patch"
+
+       # Fix build when sgen disabled
+       # https://bugzilla.xamarin.com/show_bug.cgi?id=32015
+       #eapply 
"${FILESDIR}/${PN}-4.0.2.5-fix-mono-dis-makefile-am-when-without-sgen.patch"
+
+       # TODO: update patch
+       # Fix atomic_add_i4 support for 32-bit ppc
+       # 
https://github.com/mono/mono/compare/f967c79926900343f399c75624deedaba460e544^...8f379f0c8f98493180b508b9e68b9aa76c0c5bdf
+       #epatch "${FILESDIR}/${PN}-4.0.2.5-fix-ppc-atomic-add-i4.patch"
+
+       # TODO: update patch
+       #epatch "${FILESDIR}/systemweb3.patch"
+       #epatch 
"${FILESDIR}/fix-for-GitExtensions-issue-2710-another-resolution.patch"
+       #epatch "${FILESDIR}/fix-for-bug36724.patch"
+
+       default
+       #eapply_user
+       multilib_copy_sources
+}
+
+multilib_src_configure() {
+       local myeconfargs=(
+               --disable-silent-rules
+               $(use_with xen xen_opt)
+               --without-ikvm-native
+               --disable-dtrace
+               $(use_with doc mcs-docs)
+               $(use_enable nls)
+       )
+
+       econf "${myeconfargs[@]}"
+}
+
+multilib_src_test() {
+       cd mcs/tests || die
+       emake check
+}
+
+multilib_src_install() {
+       default_src_install
+
+       # Remove files not respecting LDFLAGS and that we are not supposed to 
provide, see Fedora
+       # mono.spec and 
http://www.mail-archive.com/[email protected]/msg24870.html
+       # for reference.
+       rm -f "${ED}"/usr/lib/mono/{2.0,4.5}/mscorlib.dll.so || die
+       rm -f "${ED}"/usr/lib/mono/{2.0,4.5}/mcs.exe.so || die
+}

Reply via email to