diff options
| author |   Saul Wold <sgw@linux.intel.com> | 2011-09-24 11:56:47 -0700 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-09-25 15:27:11 +0100 |
| commit | ba574f5b0d6fd9fd899d4007305a98cbac4c4726 (patch) | |
| tree | 4b243a901d37d7f2629fb1c2e041a07e274595b1 /meta | |
| parent | 6fa93342a173f784fe5d77d33bbd901820b0ec7e (diff) | |
| download | openembedded-core-ba574f5b0d6fd9fd899d4007305a98cbac4c4726.tar.gz | |
attr/acl: add SSTATEPOSTINSTFUNC
Added a native sstate post install function to fix the links
created between /lib and /usr/lib for the library files. These
links could point to an invalid build area when using shared state.
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/recipes-support/attr/acl_2.2.51.bb | 2 | ||||
| -rw-r--r-- | meta/recipes-support/attr/attr_2.4.46.bb | 2 | ||||
| -rw-r--r-- | meta/recipes-support/attr/ea-acl.inc | 17 |
3 files changed, 19 insertions, 2 deletions
diff --git a/meta/recipes-support/attr/acl_2.2.51.bb b/meta/recipes-support/attr/acl_2.2.51.bb index 18aac7c3e7..40ba5f119f 100644 --- a/meta/recipes-support/attr/acl_2.2.51.bb +++ b/meta/recipes-support/attr/acl_2.2.51.bb @@ -1,6 +1,6 @@ require acl.inc -PR = "r1" +PR = "r2" SRC_URI[md5sum] = "3fc0ce99dc5253bdcce4c9cd437bc267" SRC_URI[sha256sum] = "06854521cf5d396801af7e54b9636680edf8064355e51c07657ec7442a185225" diff --git a/meta/recipes-support/attr/attr_2.4.46.bb b/meta/recipes-support/attr/attr_2.4.46.bb index fe8ab791f8..85c35d0c33 100644 --- a/meta/recipes-support/attr/attr_2.4.46.bb +++ b/meta/recipes-support/attr/attr_2.4.46.bb @@ -1,6 +1,6 @@ require attr.inc -PR = "r1" +PR = "r2" SRC_URI[md5sum] = "db557c17fdfa4f785333ecda08654010" SRC_URI[sha256sum] = "dcd69bdca7ff166bc45141eddbcf21967999a6b66b0544be12a1cc2fd6340e1f" diff --git a/meta/recipes-support/attr/ea-acl.inc b/meta/recipes-support/attr/ea-acl.inc index 2ef138957e..22d7848fbf 100644 --- a/meta/recipes-support/attr/ea-acl.inc +++ b/meta/recipes-support/attr/ea-acl.inc @@ -35,3 +35,20 @@ BBCLASSEXTEND = "native" # Only append ldflags for target recipe and if USE_NLS is enabled LDFLAGS_append_libc-uclibc = "${@['', ' -lintl '][(bb.data.getVar('PN', d, True) == bb.data.getVar('BPN', d , True)) and (bb.data.getVar('USE_NLS', d, True) == 'yes')]}" EXTRA_OECONF_append_libc-uclibc = "${@['', ' --disable-gettext '][(bb.data.getVar('PN', d, True) == bb.data.getVar('BPN', d , True)) and (bb.data.getVar('USE_NLS', d, True) == 'no')]}" + +fix_symlink () { + # Remove bad symlinks & create the correct symlinks + if test -L ${libdir}/lib${BPN}.so ; then + rm -rf ${libdir}/lib${BPN}.so + ln -sf ${base_libdir}/lib${BPN}.so ${libdir}/lib${BPN}.so + fi + if test -L ${base_libdir}/lib${BPN}.a ; then + rm -rf ${base_libdir}/lib${BPN}.a + ln -sf ${libdir}/lib${BPN}.a ${base_libdir}/lib${BPN}.a + fi + if test -L ${base_libdir}/lib${BPN}.la ; then + rm -rf ${base_libdir}/lib${BPN}.la + ln -sf ${libdir}/lib${BPN}.la ${base_libdir}/lib${BPN}.la + fi +} +SSTATEPOSTINSTFUNCS_virtclass-native += "fix_symlink" |