diff options
| author | Andreas Müller <schnitzeltony@gmail.com> | 2022-01-02 00:00:35 +0100 |
|---|---|---|
| committer | Khem Raj <raj.khem@gmail.com> | 2022-01-05 11:10:02 -0800 |
| commit | bfa98138accec00590e4b9456172f9dc51b111b9 (patch) | |
| tree | 766bb10d7bf10b330205341f373350b5a1af9073 /meta-oe | |
| parent | 112cca9f474b9edc8fba201e198d8ea637d495b5 (diff) | |
| download | meta-openembedded-bfa98138accec00590e4b9456172f9dc51b111b9.tar.gz | |
mozjs-78: Shelve breaking lib rename/linking & split lib to separate package
* our rename broke gjs:
| /usr/bin/gjs: error while loading shared libraries: libmozjs-78.so: cannot open shared object file: No such file or directory
* to reduce image size and to avoid warnings, follow mozjs-91 by splitting
library into seperate package
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe')
| -rw-r--r-- | meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs-78_78.15.0.bb | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs-78_78.15.0.bb b/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs-78_78.15.0.bb index aaf35f17a6..f0ab20ec8a 100644 --- a/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs-78_78.15.0.bb +++ b/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs-78_78.15.0.bb | |||
| @@ -127,16 +127,11 @@ do_install:prepend() { | |||
| 127 | prepare_python_and_rust | 127 | prepare_python_and_rust |
| 128 | } | 128 | } |
| 129 | 129 | ||
| 130 | MAJOR_VERSION = "${@oe.utils.trim_version("${PV}", 1)}" | ||
| 131 | do_install:append() { | 130 | do_install:append() { |
| 132 | # tidy up installation | 131 | # tidy up installation |
| 133 | chmod -x ${D}${libdir}/pkgconfig/*.pc | 132 | chmod -x ${D}${libdir}/pkgconfig/*.pc |
| 134 | sed -i 's:\x24{includedir}/mozjs-78/js/RequiredDefines.h:js/RequiredDefines.h:g' ${D}${libdir}/pkgconfig/*.pc | 133 | sed -i 's:\x24{includedir}/mozjs-78/js/RequiredDefines.h:js/RequiredDefines.h:g' ${D}${libdir}/pkgconfig/*.pc |
| 135 | 134 | ||
| 136 | mv ${D}${libdir}/libmozjs-${MAJOR_VERSION}.so ${D}${libdir}/libmozjs-${MAJOR_VERSION}.so.${PV} | ||
| 137 | ln -s libmozjs-${MAJOR_VERSION}.so.${PV} ${D}${libdir}/libmozjs-${MAJOR_VERSION}.so.${MAJOR_VERSION} | ||
| 138 | ln -s libmozjs-${MAJOR_VERSION}.so.${PV} ${D}${libdir}/libmozjs-${MAJOR_VERSION}.so | ||
| 139 | |||
| 140 | rm -f ${D}${libdir}/libjs_static.ajs | 135 | rm -f ${D}${libdir}/libjs_static.ajs |
| 141 | } | 136 | } |
| 142 | 137 | ||
| @@ -144,3 +139,6 @@ ARM_INSTRUCTION_SET:armv5 = "arm" | |||
| 144 | ARM_INSTRUCTION_SET:armv4 = "arm" | 139 | ARM_INSTRUCTION_SET:armv4 = "arm" |
| 145 | 140 | ||
| 146 | DISABLE_STATIC = "" | 141 | DISABLE_STATIC = "" |
| 142 | |||
| 143 | PACKAGES =+ "lib${BPN}" | ||
| 144 | FILES:lib${BPN} += "${libdir}/lib*" | ||
