diff options
| author |   cyborgyn <cyborgyn@gmail.com> | 2021-05-29 19:49:20 +0200 |
|---|---|---|
| committer |   Gergely Nagy <ngg@ngg.hu> | 2021-06-04 16:21:31 +0200 |
| commit | bfa309c5d43b91b2ae825b13d235580a0eabf46d (patch) | |
| tree | 12d310c8e928085a5652229dcebd3d28ca83e8d7 /eclass | |
| parent | dev-dotnet/msbuild-roslyn-csc: Add patch to fix roslyn build (diff) | |
| download | dotnet-bfa309c5d43b91b2ae825b13d235580a0eabf46d.tar.gz dotnet-bfa309c5d43b91b2ae825b13d235580a0eabf46d.tar.bz2 dotnet-bfa309c5d43b91b2ae825b13d235580a0eabf46d.zip | |
Remove -gacdir parameter & force /usr/lib for every platform as mono GAC dir
Signed-off-by: Gergely Nagy <ngg@ngg.hu>
Closes: https://github.com/gentoo/dotnet/issues/500
Closes: https://github.com/gentoo/dotnet/pull/502
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/gac.eclass | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/eclass/gac.eclass b/eclass/gac.eclass index 2ca6417..5a29b73 100644 --- a/eclass/gac.eclass +++ b/eclass/gac.eclass @@ -28,14 +28,12 @@ egacinstall() { if use gac; then if use pkg-config; then gacutil -i "${1}" \ - -root "${ED}"/usr/$(get_libdir) \ - -gacdir /usr/$(get_libdir) \ + -root "${ED}"/usr/lib \ -package ${2:-${GACPN:-${PN}}} \ || die "installing ${1} into the Global Assembly Cache failed" else gacutil -i "${1}" \ - -root "${ED}"/usr/$(get_libdir) \ - -gacdir /usr/$(get_libdir) \ + -root "${ED}"/usr/lib \ || die "installing ${1} into the Global Assembly Cache failed" fi fi @@ -45,12 +43,11 @@ egacinstall() { # @DESCRIPTION: install package to GAC egacadd() { if use gac; then - GACROOT="${PREFIX}/usr/$(get_libdir)" + GACROOT="${PREFIX}/usr/lib" GACDIR="/usr/$(get_libdir)/mono/gac" - einfo gacutil -i "${PREFIX}/${1}" -root "${GACROOT}" -gacdir "${GACDIR}" + einfo gacutil -i "${PREFIX}/${1}" -root "${GACROOT}" gacutil -i "${PREFIX}/${1}" \ -root ${GACROOT} \ - -gacdir ${GACDIR} \ || die "installing ${1} into the Global Assembly Cache failed" fi } @@ -59,12 +56,11 @@ egacadd() { # @DESCRIPTION: remove package from GAC egacdel() { if use gac; then - GACROOT="${PREFIX}/usr/$(get_libdir)" + GACROOT="${PREFIX}/usr/lib" GACDIR="/usr/$(get_libdir)/mono/gac" - einfo gacutil -u "${1}" -root "${GACROOT}" -gacdir "${GACDIR}" + einfo gacutil -u "${1}" -root "${GACROOT}" gacutil -u "${1}" \ -root ${GACROOT} \ - -gacdir ${GACDIR} # don't die fi } |