[oe-commits] org.oe.dev mono.bclass: Fix the location used for mono clilibs information to be host specific otherwise this will break when multiple arch builds are made. shlibs was fixed in a similar way. Note that mono apps will need to be rebuilt after this change

[rpurdie commit]

mono.bclass: Fix the location used for mono clilibs information to be host specific otherwise this will break when multiple arch builds are made. shlibs was fixed in a similar way. Note that mono apps will need to be rebuilt after this change

Author: rpurdie at openembedded.org
Branch: org.openembedded.dev
Revision: 5210c083ec8a6cdc5a8ab04ea377114cbb2938b3
ViewMTN: http://monotone.openembedded.org/revision/info/5210c083ec8a6cdc5a8ab04ea377114cbb2938b3
Files:
1
classes/mono.bbclass
packages/mono/README
Diffs:

#
# mt diff -r77fcc376ce406668f13d7aa04a11f78c7879d878 -r5210c083ec8a6cdc5a8ab04ea377114cbb2938b3
#
# 
# 
# patch "classes/mono.bbclass"
#  from [5d50e08d7aafe36c91db4fc56497a7b639ccc431]
#    to [151ae18991616e411a23875f2b867b1a38f6d548]
# 
# patch "packages/mono/README"
#  from [d1f3e17ed747876212c9db254308b2267f19c3c5]
#    to [ce24307d6afe8343f5db95c14efcac462e36c160]
# 
============================================================
--- classes/mono.bbclass	5d50e08d7aafe36c91db4fc56497a7b639ccc431
+++ classes/mono.bbclass	151ae18991616e411a23875f2b867b1a38f6d548
@@ -52,6 +52,8 @@ def mono_find_provides_and_requires(file
 	requires = [e for e in requires if not e in provides]
 	return provides, requires
 
+CLILIBSDIR = "${STAGING_DIR_HOST}/clilibs"
+
 python mono_do_clilibs() {
 	import bb, os, re, os.path
 
@@ -70,14 +72,9 @@ python mono_do_clilibs() {
 		bb.error("WORKDIR not defined")
 		return
 
-	staging = bb.data.getVar('STAGING_DIR', d, 1)
-	if not staging:
-		bb.error("STAGING_DIR not defined")
-		return
-
 	pkgdest = bb.data.getVar('PKGDEST', d, 1)
 
-	clilibs_dir = os.path.join(staging, "clilibs")
+	clilibs_dir = bb.data.getVar('CLILIBSDIR', d, 1)
 	bb.mkdirhier(clilibs_dir)
 
 	provides, requires = {}, {}
============================================================
--- packages/mono/README	d1f3e17ed747876212c9db254308b2267f19c3c5
+++ packages/mono/README	ce24307d6afe8343f5db95c14efcac462e36c160
@@ -28,6 +28,6 @@ puts the information about provided asse
 calls to monodis --assembly and monodis --assemblyref) which assemblies are
 provided and required by a particular package. mono_do_clilibs then
 puts the information about provided assemblies into
-${STAGING_DIR}/clilibs/${packagename}.list and information about the
+${CLILIBSDIR}/${packagename}.list and information about the
 required packages into ${PKGDEST}/{packagename}.clilibdeps where it
 will later be picked up by read_shlibdeps.