| 1 |
commit: bfa309c5d43b91b2ae825b13d235580a0eabf46d |
| 2 |
Author: cyborgyn <cyborgyn <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Sat May 29 17:49:20 2021 +0000 |
| 4 |
Commit: Gergely Nagy <ngg <AT> ngg <DOT> hu> |
| 5 |
CommitDate: Fri Jun 4 14:21:31 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/proj/dotnet.git/commit/?id=bfa309c5 |
| 7 |
|
| 8 |
Remove -gacdir parameter & force /usr/lib for every platform as mono GAC dir |
| 9 |
|
| 10 |
Signed-off-by: Gergely Nagy <ngg <AT> ngg.hu> |
| 11 |
Closes: https://github.com/gentoo/dotnet/issues/500 |
| 12 |
Closes: https://github.com/gentoo/dotnet/pull/502 |
| 13 |
|
| 14 |
dev-dotnet/buildtools/buildtools-1.0.27-r1.ebuild | 2 +- |
| 15 |
eclass/gac.eclass | 16 ++++++---------- |
| 16 |
2 files changed, 7 insertions(+), 11 deletions(-) |
| 17 |
|
| 18 |
diff --git a/dev-dotnet/buildtools/buildtools-1.0.27-r1.ebuild b/dev-dotnet/buildtools/buildtools-1.0.27-r1.ebuild |
| 19 |
index dc0c782..5a1cef7 100644 |
| 20 |
--- a/dev-dotnet/buildtools/buildtools-1.0.27-r1.ebuild |
| 21 |
+++ b/dev-dotnet/buildtools/buildtools-1.0.27-r1.ebuild |
| 22 |
@@ -73,6 +73,6 @@ src_install() { |
| 23 |
insinto "/usr/lib/mono/xbuild" |
| 24 |
doins "${S}/src/Microsoft.DotNet.Build.Tasks/PackageFiles/resources.targets" |
| 25 |
if use symlink; then |
| 26 |
- dosym "/usr/$(get_libdir)/mono/gac/${PROJ1}/1.0.27.0__0738eb9f132ed756/${PROJ1}.dll" "/usr/lib/mono/xbuild/${PROJ1}.dll" |
| 27 |
+ dosym "/usr/lib/mono/gac/${PROJ1}/1.0.27.0__0738eb9f132ed756/${PROJ1}.dll" "/usr/lib/mono/xbuild/${PROJ1}.dll" |
| 28 |
fi |
| 29 |
} |
| 30 |
|
| 31 |
diff --git a/eclass/gac.eclass b/eclass/gac.eclass |
| 32 |
index 2ca6417..5a29b73 100644 |
| 33 |
--- a/eclass/gac.eclass |
| 34 |
+++ b/eclass/gac.eclass |
| 35 |
@@ -28,14 +28,12 @@ egacinstall() { |
| 36 |
if use gac; then |
| 37 |
if use pkg-config; then |
| 38 |
gacutil -i "${1}" \ |
| 39 |
- -root "${ED}"/usr/$(get_libdir) \ |
| 40 |
- -gacdir /usr/$(get_libdir) \ |
| 41 |
+ -root "${ED}"/usr/lib \ |
| 42 |
-package ${2:-${GACPN:-${PN}}} \ |
| 43 |
|| die "installing ${1} into the Global Assembly Cache failed" |
| 44 |
else |
| 45 |
gacutil -i "${1}" \ |
| 46 |
- -root "${ED}"/usr/$(get_libdir) \ |
| 47 |
- -gacdir /usr/$(get_libdir) \ |
| 48 |
+ -root "${ED}"/usr/lib \ |
| 49 |
|| die "installing ${1} into the Global Assembly Cache failed" |
| 50 |
fi |
| 51 |
fi |
| 52 |
@@ -45,12 +43,11 @@ egacinstall() { |
| 53 |
# @DESCRIPTION: install package to GAC |
| 54 |
egacadd() { |
| 55 |
if use gac; then |
| 56 |
- GACROOT="${PREFIX}/usr/$(get_libdir)" |
| 57 |
+ GACROOT="${PREFIX}/usr/lib" |
| 58 |
GACDIR="/usr/$(get_libdir)/mono/gac" |
| 59 |
- einfo gacutil -i "${PREFIX}/${1}" -root "${GACROOT}" -gacdir "${GACDIR}" |
| 60 |
+ einfo gacutil -i "${PREFIX}/${1}" -root "${GACROOT}" |
| 61 |
gacutil -i "${PREFIX}/${1}" \ |
| 62 |
-root ${GACROOT} \ |
| 63 |
- -gacdir ${GACDIR} \ |
| 64 |
|| die "installing ${1} into the Global Assembly Cache failed" |
| 65 |
fi |
| 66 |
} |
| 67 |
@@ -59,12 +56,11 @@ egacadd() { |
| 68 |
# @DESCRIPTION: remove package from GAC |
| 69 |
egacdel() { |
| 70 |
if use gac; then |
| 71 |
- GACROOT="${PREFIX}/usr/$(get_libdir)" |
| 72 |
+ GACROOT="${PREFIX}/usr/lib" |
| 73 |
GACDIR="/usr/$(get_libdir)/mono/gac" |
| 74 |
- einfo gacutil -u "${1}" -root "${GACROOT}" -gacdir "${GACDIR}" |
| 75 |
+ einfo gacutil -u "${1}" -root "${GACROOT}" |
| 76 |
gacutil -u "${1}" \ |
| 77 |
-root ${GACROOT} \ |
| 78 |
- -gacdir ${GACDIR} |
| 79 |
# don't die |
| 80 |
fi |
| 81 |
} |
Archives