From 4a10634a88f15bff4660310df772e0300dfe61d3 Mon Sep 17 00:00:00 2001 From: Darren Hart Date: Mon, 20 Sep 2010 16:15:05 -0700 Subject: Correct js jsautocfg.h and install jsproto.tbl I'm adding mediatomb packages and ran into a couple build issues with js. The first complained that jsapi.h wasn't found/usable. This turned out to be because jsautocfg.h was including "../conf.h" instead of "conf.h" as they are installed in the same directory in the sysroot. I believe the correct fix for this would involve the configure.ac script which is used to generate the jsautocfg.h header file we store in the recipe. Commit f25d26de776f9927e1d2c92f031085a9b9323087 (js: fix configure) added conf.h, Qing can you comment here? The second failure is due to jsproto.tbl not being installed but being referenced by another header file. This patch corrects the jsautocfg.h header directly and adds the jsproto.tbl to the do_install() recipe function. Signed-off-by: Darren Hart CC: Qing He --- meta/recipes-support/js/files/jsautocfg.h | 2 +- meta/recipes-support/js/js_1.7.0+1.8.0rc1.bb | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'meta/recipes-support/js') diff --git a/meta/recipes-support/js/files/jsautocfg.h b/meta/recipes-support/js/files/jsautocfg.h index 16e38bf8d6..295e4919bb 100644 --- a/meta/recipes-support/js/files/jsautocfg.h +++ b/meta/recipes-support/js/files/jsautocfg.h @@ -3,7 +3,7 @@ /* AUTOMATICALLY GENERATED - DO NOT EDIT */ -#include "../conf.h" +#include "conf.h" #ifdef WORDS_BIGENDIAN # undef IS_LITTLE_ENDIAN diff --git a/meta/recipes-support/js/js_1.7.0+1.8.0rc1.bb b/meta/recipes-support/js/js_1.7.0+1.8.0rc1.bb index 97cba90d03..3632eb93e7 100644 --- a/meta/recipes-support/js/js_1.7.0+1.8.0rc1.bb +++ b/meta/recipes-support/js/js_1.7.0+1.8.0rc1.bb @@ -5,7 +5,7 @@ SECTION = "libs" # the package is licensed under either of the following LICENSE = "MPL1.1 | GPLv2+ | LGPLv2.1+" LIC_FILES_CHKSUM = "file://jsapi.c;beginline=4;endline=39;md5=347c6bbf4fb4547de1fa5ad830030063" -PR = "r1" +PR = "r2" SRC_URI = "http://ftp.mozilla.org/pub/mozilla.org/js/js-1.8.0-rc1.tar.gz \ file://link_with_gcc.patch \ @@ -40,6 +40,7 @@ do_install() { install -d ${D}${includedir}/js oe_libinstall -so -C Linux_All_OPT.OBJ libjs ${D}${libdir} install -m 0644 ${S}/*.h ${D}${includedir}/js + install -m 0644 ${S}/jsproto.tbl ${D}${includedir}/js } FILES_${PN} = "${libdir}/lib*.so" -- cgit v1.2.3-54-g00ecf