diff options
| author | Richard Purdie <rpurdie@rpsys.net> | 2008-02-28 11:54:41 +0000 |
|---|---|---|
| committer | Richard Purdie <rpurdie@rpsys.net> | 2008-02-28 11:54:41 +0000 |
| commit | 70d0879a2267b4f02025ff0f323c3659fa81d68d (patch) | |
| tree | aee7d315d34542c49f5b490db75d8b9850f4ed2e | |
| parent | 81d59df280284eb7e72f16aff290f238a88204db (diff) | |
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
| -rw-r--r-- | classes/mono.bbclass | 9 | ||||
| -rw-r--r-- | packages/mono/README | 2 |
2 files changed, 4 insertions, 7 deletions
diff --git a/classes/mono.bbclass b/classes/mono.bbclass index ccb16d9acc..cf8dd15bdf 100644 --- a/classes/mono.bbclass +++ b/classes/mono.bbclass @@ -52,6 +52,8 @@ def mono_find_provides_and_requires(files, d): 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 = {}, {} diff --git a/packages/mono/README b/packages/mono/README index eb2fed051f..61bba80c07 100644 --- a/packages/mono/README +++ b/packages/mono/README @@ -28,6 +28,6 @@ This function calls mono_find_provides_and_requires which finds out (through 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. |