diff options
Diffstat (limited to 'meta-oe/recipes-devtools')
-rw-r--r-- | meta-oe/recipes-devtools/tcltk/tk_8.6.0.bb | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/meta-oe/recipes-devtools/tcltk/tk_8.6.0.bb b/meta-oe/recipes-devtools/tcltk/tk_8.6.0.bb index b76f58f9e..e99952293 100644 --- a/meta-oe/recipes-devtools/tcltk/tk_8.6.0.bb +++ b/meta-oe/recipes-devtools/tcltk/tk_8.6.0.bb | |||
@@ -24,18 +24,31 @@ EXTRA_OECONF = "\ | |||
24 | --enable-threads \ | 24 | --enable-threads \ |
25 | --with-x \ | 25 | --with-x \ |
26 | --with-tcl=${STAGING_BINDIR_CROSS} \ | 26 | --with-tcl=${STAGING_BINDIR_CROSS} \ |
27 | --libdir=${libdir} \ | ||
27 | " | 28 | " |
28 | 29 | ||
29 | do_install_append() { | 30 | do_install_append() { |
30 | mv libtk8.6.so libtk8.6.so.0 | 31 | ln -sf libtk8.6.so ${D}${libdir}/libtk8.6.so.0 |
31 | oe_libinstall -so libtk8.6 ${D}${libdir} | 32 | oe_libinstall -so libtk8.6 ${D}${libdir} |
32 | ln -sf wish8.6 ${D}${bindir}/wish | 33 | ln -sf wish8.6 ${D}${bindir}/wish |
34 | |||
35 | # Even after passing libdir=${libdir} at config, some incorrect dirs are still generated for the multilib build | ||
36 | if [ "$libdir" != "/usr/lib" ]; then | ||
37 | # Move files to correct library directory | ||
38 | mv ${D}/usr/lib/tk8.6/* ${D}/${libdir}/tk8.6/ | ||
39 | # Remove unneeded/incorrect dir ('usr/lib/') | ||
40 | rm -rf ${D}/usr/lib | ||
41 | fi | ||
33 | } | 42 | } |
34 | 43 | ||
35 | PACKAGES =+ "${PN}-lib" | 44 | PACKAGES =+ "${PN}-lib" |
36 | 45 | ||
37 | FILES_${PN}-lib = "${libdir}/libtk8.6.so.*" | 46 | FILES_${PN}-lib = "${libdir}/libtk8.6.so*" |
38 | FILES_${PN} += "${libdir}/tk*" | 47 | FILES_${PN} += "${libdir}/tk*" |
39 | 48 | ||
49 | # isn't getting picked up by shlibs code | ||
50 | RDEPENDS_${PN} += "tk-lib" | ||
51 | RDEPENDS_${PN}_class-native = "" | ||
52 | |||
40 | BINCONFIG_GLOB = "*Config.sh" | 53 | BINCONFIG_GLOB = "*Config.sh" |
41 | BBCLASSEXTEND = "native" | 54 | BBCLASSEXTEND = "native" |