3 files changed, 38 insertions, 11 deletions

diff --git a/meta/packages/js/files/buildcc.patch b/meta/packages/js/files/buildcc.patch
new file mode 100644
index 0000000000..26eef218d6
--- /dev/null
+++ b/meta/packages/js/files/buildcc.patch
@@ -0,0 +1,20 @@
+jskwgen should be built by BUILD_CC in cross environment
+
+7/23/2010 - created by Qing He <qing.he@intel.com>
+
+diff -uNr js.orig//src/Makefile.ref js/src/Makefile.ref
+--- js.orig//src/Makefile.ref   2009-02-25 21:24:29.000000000 +0800
++++ js/src/Makefile.ref 2010-07-23 13:26:51.000000000 +0800
+@@ -303,10 +303,10 @@
+ 
+ $(OBJDIR)/jskwgen.o: jskwgen.c jskeyword.tbl
+        @$(MAKE_OBJDIR)
+-       $(CC) -o $@ -c $(CFLAGS) $<
++       $(BUILD_CC) -o $@ -c $(BUILD_CFLAGS) $<
+ 
+ $(OBJDIR)/jskwgen$(HOST_BIN_SUFFIX): $(OBJDIR)/jskwgen.$(OBJ_SUFFIX)
+-       $(CC) -o $@ $(CFLAGS) $(LDFLAGS) $^
++       $(BUILD_CC) -o $@ $(BUILD_CFLAGS) $(BUILD_LDFLAGS) $^
+ 
+ endif
+ 
diff --git a/meta/packages/js/files/jsautocfg.h b/meta/packages/js/files/jsautocfg.h
index ac786dcdad..efaf807acc 100644
--- a/meta/packages/js/files/jsautocfg.h
+++ b/meta/packages/js/files/jsautocfg.h
@@ -49,4 +49,6 @@
 
 #define JS_STACK_GROWTH_DIRECTION (-1)
 
+#define JS_HAVE_LONG_LONG
+
 #endif /* js_cpucfg___ */
diff --git a/meta/packages/js/js_1.5.bb b/meta/packages/js/js_1.7.0+1.8.0rc1.bb
index fe8c8c2b9b..36ad11d1f6 100644
--- a/meta/packages/js/js_1.5.bb
+++ b/meta/packages/js/js_1.7.0+1.8.0rc1.bb
@@ -4,34 +4,39 @@ SECTION = "libs"
 
 # the package is licensed under either of the following
 LICENSE = "MPL1.1 | GPLv2+ | LGPLv2.1+"
-DEPENDS = "readline"
-PR = "r1"
-SRC_URI = "http://ftp.mozilla.org/pub/mozilla.org/js/older-packages/js-1.5.tar.gz \
-           file://link_with_gcc.patch;patch=1 \
-           file://usepic.patch;patch=1 \
+LIC_FILES_CHKSUM = "file://jsapi.c;beginline=4;endline=39;md5=347c6bbf4fb4547de1fa5ad830030063"
+PR = "r0"
+
+SRC_URI = "http://ftp.mozilla.org/pub/mozilla.org/js/js-1.8.0-rc1.tar.gz \
+           file://link_with_gcc.patch \
+           file://usepic.patch \
+           file://buildcc.patch;striplevel=2 \
            file://jsautocfg.h"
 
 S = "${WORKDIR}/js/src"
 
-FILES_${PN} = "${libdir}/lib*.so"
-FILES_${PN}-dev = "${includedir} ${libdir}/lib*.a"
-
-EXTRA_OEMAKE = "'CC=${CC}' 'LD=${LD}' 'XCFLAGS=${CFLAGS}' 'XLDFLAGS=${LDFLAGS} -Wl,-soname=libjs'"
+EXTRA_OEMAKE = "'CC=${CC}' 'LD=${LD}' 'XCFLAGS=${CFLAGS}' 'XLDFLAGS=${LDFLAGS} -Wl,-soname=libjs' \
+                'BUILD_CC=${BUILD_CC}' 'BUILD_CFLAGS=${BUILD_CFLAGS}' 'BUILD_LDFLAGS=${BUILD_LDFLAGS}'"
 
 PARALLEL_MAKE = ""
 
+# XXX: this is only guaranteed to work for i386 targets!
 do_compile_prepend() {
         cp ${WORKDIR}/jsautocfg.h ${S}/
 }
 
 do_compile() {
-        oe_runmake -f Makefile.ref JS_READLINE=1 JS_EDITLINE=1 PREBUILT_CPUCFG=1
+        oe_runmake -f Makefile.ref JS_EDITLINE=1 PREBUILT_CPUCFG=1 BUILD_OPT=1
 }
 
 do_install() {
         install -d ${D}${libdir}
         install -d ${D}${includedir}
         install -d ${D}${includedir}/js
-        oe_libinstall -so -C Linux_All_DBG.OBJ libjs ${D}${libdir}
+        oe_libinstall -so -C Linux_All_OPT.OBJ libjs ${D}${libdir}
         install -m 0644 ${S}/*.h ${D}${includedir}/js
 }
+
+FILES_${PN} = "${libdir}/lib*.so"
+FILES_${PN}-dev = "${includedir} ${libdir}/lib*.a"
+