aboutsummaryrefslogtreecommitdiff
path: root/eclass
diff options
context:
space:
mode:
authorArsenShnurkov <ArsenShnurkov@users.noreply.github.com>2017-10-02 07:14:03 +0300
committerArsenShnurkov <ArsenShnurkov@users.noreply.github.com>2017-10-02 07:14:03 +0300
commit607df5a25f7ee1549e950d5844b3b2b361f68ab3 (patch)
tree4b75271f5bd6ee5372224f1b475a4cd720dce57b /eclass
parentMerge pull request #328 from ArsenShnurkov/msbuild (diff)
downloaddotnet-607df5a25f7ee1549e950d5844b3b2b361f68ab3.tar.gz
dotnet-607df5a25f7ee1549e950d5844b3b2b361f68ab3.tar.bz2
dotnet-607df5a25f7ee1549e950d5844b3b2b361f68ab3.zip
dev-dotnet/remotion-linq
Diffstat (limited to 'eclass')
-rw-r--r--eclass/gac.eclass20
-rw-r--r--eclass/msbuild.eclass6
2 files changed, 12 insertions, 14 deletions
diff --git a/eclass/gac.eclass b/eclass/gac.eclass
index d972e05..031dcd8 100644
--- a/eclass/gac.eclass
+++ b/eclass/gac.eclass
@@ -45,11 +45,12 @@ egacinstall() {
# @DESCRIPTION: install package to GAC
egacadd() {
if use gac; then
- use !prefix && has "${EAPI:-0}" 0 1 2 && ED="${D}"
- gacutil -i "${1}" \
- -root "${ED}"/usr/$(get_libdir) \
- -gacdir /usr/$(get_libdir) \
- -package ${2:-${GACPN:-${PN}}} \
+ GACROOT="${PREFIX}/usr/$(get_libdir)"
+ GACDIR="/usr/$(get_libdir)/mono/gac"
+ einfo gacutil -i "${PREFIX}/${1}" -root "${GACROOT}" -gacdir "${GACDIR}"
+ gacutil -i "${PREFIX}/${1}" \
+ -root ${GACROOT} \
+ -gacdir ${GACDIR} \
|| die "installing ${1} into the Global Assembly Cache failed"
fi
}
@@ -58,11 +59,12 @@ egacadd() {
# @DESCRIPTION: remove package from GAC
egacdel() {
if use gac; then
- use !prefix && has "${EAPI:-0}" 0 1 2 && ED="${D}"
+ GACROOT="${PREFIX}/usr/$(get_libdir)"
+ GACDIR="/usr/$(get_libdir)/mono/gac"
+ einfo gacutil -u "${PREFIX}/${1}" -root "${GACROOT}" -gacdir "${GACDIR}"
gacutil -u "${1}" \
- -root "${ED}"/usr/$(get_libdir) \
- -gacdir /usr/$(get_libdir) \
- -package ${2:-${GACPN:-${PN}}}
+ -root ${GACROOT} \
+ -gacdir ${GACDIR}
# don't die
fi
}
diff --git a/eclass/msbuild.eclass b/eclass/msbuild.eclass
index fae886f..c935135 100644
--- a/eclass/msbuild.eclass
+++ b/eclass/msbuild.eclass
@@ -19,10 +19,6 @@ esac
IUSE+=" debug developer"
DEPEND+=" dev-util/msbuild"
-# >=mono-0.92 versions using mcs -pkg:foo-sharp require shared memory, so we set the
-# shared dir to ${T} so that ${T}/.wapi can be used during the install process.
-export MONO_SHARED_DIR="${T}"
-
# Monodevelop-using applications need this to be set or they will try to create config
# files in the user's ~ dir.
export XDG_CONFIG_HOME="${T}"
@@ -36,7 +32,7 @@ export LC_ALL=C
# @DESCRIPTION: run msbuild with given parameters
emsbuild_raw() {
elog """$@"""
- msbuild /p:MSBuildToolsPath=/usr/lib/mono/xbuild "$@" || die
+ msbuild "$@" || die
}
# @FUNCTION: emsbuild