diff options
| -rw-r--r-- | openembedded/conf/distro/poky.conf | 6 | ||||
| -rw-r--r-- | openembedded/packages/js/js_1.5.bb | 5 |
2 files changed, 5 insertions, 6 deletions
diff --git a/openembedded/conf/distro/poky.conf b/openembedded/conf/distro/poky.conf index 62ac06ffe7..365a79984e 100644 --- a/openembedded/conf/distro/poky.conf +++ b/openembedded/conf/distro/poky.conf @@ -120,13 +120,13 @@ PREFERRED_VERSION_matchbox-wm ?= "0.9.5+svn${SRCDATE}" PREFERRED_VERSION_libmatchbox ?= "1.7+svn${SRCDATE}" PREFERRED_VERSION_xserver-kdrive = "0.0+cvs${SRCDATE}" -#PREFERRED_VERSION_atk ?= "1.10.0" +#PREFERRED_VERSION_atk ?= "1.10.1" #PREFERRED_VERSION_cairo ?= "1.0.0" PREFERRED_VERSION_glib-2.0 ?= "2.8.6" #PREFERRED_VERSION_gtk+ ?= "2.8.9" #PREFERRED_VERSION_pango ?= "1.10.0" -PREFERRED_VERSION_atk ?= "1.9.0" +PREFERRED_VERSION_atk ?= "1.10.1" #PREFERRED_VERSION_glib-2.0 ?= "2.6.4" PREFERRED_VERSION_gtk+ ?= "2.6.7" PREFERRED_VERSION_pango ?= "1.10.0" @@ -161,6 +161,6 @@ PREFERRED_VERSION_xproto ?= "6.6.2" PREFERRED_VERSION_xrdb ?= "0.0+cvs${SRCDATE}" PREFERRED_VERSION_xst ?= "0.15" -PREFERRED_VERSION_oprofile ?= "0.0+cvs${SRCDATE}" +PREFERRED_VERSION_oprofile ?= "0.9.1+cvs${SRCDATE}" PCMCIA_MANAGER = "pcmciautils" diff --git a/openembedded/packages/js/js_1.5.bb b/openembedded/packages/js/js_1.5.bb index 5af1441e36..040538a8ff 100644 --- a/openembedded/packages/js/js_1.5.bb +++ b/openembedded/packages/js/js_1.5.bb @@ -11,7 +11,7 @@ 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=-L${STAGING_LIBDIR}'" +EXTRA_OEMAKE = "'CC=${CC}' 'LD=${LD}' 'XCFLAGS=${CFLAGS}' 'XLDFLAGS=-L${STAGING_LIBDIR} -soname=libjs'" do_compile_prepend() { cp ${WORKDIR}/jsautocfg.h ${S}/ @@ -25,8 +25,7 @@ do_install() { install -d ${D}${libdir} install -d ${D}${includedir} install -d ${D}${includedir}/js - install -m 0644 ${S}/Linux_All_DBG.OBJ/lib*.so ${D}${libdir} - install -m 0644 ${S}/Linux_All_DBG.OBJ/lib*.a ${D}${libdir} + oe_libinstall -so -C Linux_All_DBG.OBJ libjs ${D}${libdir} install -m 0644 ${S}/*.h ${D}${includedir}/js } |