On Mar 2, 2014, at 7:25 PM, Lu Chong <[email protected]> wrote:
> > On 03/01/2014 02:28 AM, Ross Burton wrote: >> Instead of using a Python do_install() and calling >> oe.path.make_relative_symlink, just pass -r to ln to generate a relative >> symlink >> directly. >> >> Signed-off-by: Ross Burton <[email protected]> >> --- >> meta/recipes-core/ncurses/ncurses.inc | 10 ++-------- >> 1 file changed, 2 insertions(+), 8 deletions(-) >> >> diff --git a/meta/recipes-core/ncurses/ncurses.inc >> b/meta/recipes-core/ncurses/ncurses.inc >> index a94466a..835ecc3 100644 >> --- a/meta/recipes-core/ncurses/ncurses.inc >> +++ b/meta/recipes-core/ncurses/ncurses.inc >> @@ -147,12 +147,7 @@ _install_cfgs = "\ >> PKG_CONFIG_LIBDIR='${libdir}/pkgconfig' \ >> " >> -python do_install () { >> - bb.build.exec_func("shell_do_install", d) >> - oe.path.make_relative_symlink(d.expand("${D}${libdir}/libtinfo.so")) >> -} >> - >> -shell_do_install() { >> +do_install() { >> # Order of installation is important; widec installs a 'curses.h' >> # header with more definitions and must be installed last hence. >> # Compatibility of these headers will be checked in 'do_test()'. >> @@ -226,8 +221,7 @@ shell_do_install() { >> mv ${D}${libdir}/libtinfo.so.* ${D}${base_libdir} >> rm ${D}${libdir}/libtinfo.so >> - # We'll turn this into a relative symlink after do_install >> returns >> - ln -sf ${D}${base_libdir}/libtinfo.so.5 >> ${D}${libdir}/libtinfo.so >> + ln -rsf ${D}${base_libdir}/libtinfo.so.5 >> ${D}${libdir}/libtinfo.so > Hi Ross, > > In Ubuntu 12.04, `ln' command doesn't have '-r' option. > we will get following error during building ncurses > ln: invalid option -- ‘r' count debian in too. > > Best Regards > Chong >> fi >> oe_multilib_header curses.h > > _______________________________________________ > Openembedded-core mailing list > [email protected] > http://lists.openembedded.org/mailman/listinfo/openembedded-core
signature.asc
Description: Message signed with OpenPGP using GPGMail
_______________________________________________ Openembedded-core mailing list [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-core
