diff options
author | Richard Purdie <richard@openedhand.com> | 2006-05-25 09:57:54 +0000 |
---|---|---|
committer | Richard Purdie <richard@openedhand.com> | 2006-05-25 09:57:54 +0000 |
commit | 3f4947c2e69ed250d2aa2deae282fbc5d7202d1e (patch) | |
tree | 2751081504451bcf176d263d28eeffe7b5ade827 /openembedded | |
parent | a187ca15fefa583a409efac15e8210715cb6c4f2 (diff) | |
download | poky-3f4947c2e69ed250d2aa2deae282fbc5d7202d1e.tar.gz |
js: Set soname so the package shlibs code works properly, fixing problems with web
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@420 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'openembedded')
-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}" | |||
120 | PREFERRED_VERSION_libmatchbox ?= "1.7+svn${SRCDATE}" | 120 | PREFERRED_VERSION_libmatchbox ?= "1.7+svn${SRCDATE}" |
121 | PREFERRED_VERSION_xserver-kdrive = "0.0+cvs${SRCDATE}" | 121 | PREFERRED_VERSION_xserver-kdrive = "0.0+cvs${SRCDATE}" |
122 | 122 | ||
123 | #PREFERRED_VERSION_atk ?= "1.10.0" | 123 | #PREFERRED_VERSION_atk ?= "1.10.1" |
124 | #PREFERRED_VERSION_cairo ?= "1.0.0" | 124 | #PREFERRED_VERSION_cairo ?= "1.0.0" |
125 | PREFERRED_VERSION_glib-2.0 ?= "2.8.6" | 125 | PREFERRED_VERSION_glib-2.0 ?= "2.8.6" |
126 | #PREFERRED_VERSION_gtk+ ?= "2.8.9" | 126 | #PREFERRED_VERSION_gtk+ ?= "2.8.9" |
127 | #PREFERRED_VERSION_pango ?= "1.10.0" | 127 | #PREFERRED_VERSION_pango ?= "1.10.0" |
128 | 128 | ||
129 | PREFERRED_VERSION_atk ?= "1.9.0" | 129 | PREFERRED_VERSION_atk ?= "1.10.1" |
130 | #PREFERRED_VERSION_glib-2.0 ?= "2.6.4" | 130 | #PREFERRED_VERSION_glib-2.0 ?= "2.6.4" |
131 | PREFERRED_VERSION_gtk+ ?= "2.6.7" | 131 | PREFERRED_VERSION_gtk+ ?= "2.6.7" |
132 | PREFERRED_VERSION_pango ?= "1.10.0" | 132 | PREFERRED_VERSION_pango ?= "1.10.0" |
@@ -161,6 +161,6 @@ PREFERRED_VERSION_xproto ?= "6.6.2" | |||
161 | PREFERRED_VERSION_xrdb ?= "0.0+cvs${SRCDATE}" | 161 | PREFERRED_VERSION_xrdb ?= "0.0+cvs${SRCDATE}" |
162 | PREFERRED_VERSION_xst ?= "0.15" | 162 | PREFERRED_VERSION_xst ?= "0.15" |
163 | 163 | ||
164 | PREFERRED_VERSION_oprofile ?= "0.0+cvs${SRCDATE}" | 164 | PREFERRED_VERSION_oprofile ?= "0.9.1+cvs${SRCDATE}" |
165 | 165 | ||
166 | PCMCIA_MANAGER = "pcmciautils" | 166 | 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" | |||
11 | FILES_${PN} = "${libdir}/lib*.so" | 11 | FILES_${PN} = "${libdir}/lib*.so" |
12 | FILES_${PN}-dev = "${includedir} ${libdir}/lib*.a" | 12 | FILES_${PN}-dev = "${includedir} ${libdir}/lib*.a" |
13 | 13 | ||
14 | EXTRA_OEMAKE = "'CC=${CC}' 'LD=${LD}' 'XCFLAGS=${CFLAGS}' 'XLDFLAGS=-L${STAGING_LIBDIR}'" | 14 | EXTRA_OEMAKE = "'CC=${CC}' 'LD=${LD}' 'XCFLAGS=${CFLAGS}' 'XLDFLAGS=-L${STAGING_LIBDIR} -soname=libjs'" |
15 | 15 | ||
16 | do_compile_prepend() { | 16 | do_compile_prepend() { |
17 | cp ${WORKDIR}/jsautocfg.h ${S}/ | 17 | cp ${WORKDIR}/jsautocfg.h ${S}/ |
@@ -25,8 +25,7 @@ do_install() { | |||
25 | install -d ${D}${libdir} | 25 | install -d ${D}${libdir} |
26 | install -d ${D}${includedir} | 26 | install -d ${D}${includedir} |
27 | install -d ${D}${includedir}/js | 27 | install -d ${D}${includedir}/js |
28 | install -m 0644 ${S}/Linux_All_DBG.OBJ/lib*.so ${D}${libdir} | 28 | oe_libinstall -so -C Linux_All_DBG.OBJ libjs ${D}${libdir} |
29 | install -m 0644 ${S}/Linux_All_DBG.OBJ/lib*.a ${D}${libdir} | ||
30 | install -m 0644 ${S}/*.h ${D}${includedir}/js | 29 | install -m 0644 ${S}/*.h ${D}${includedir}/js |
31 | } | 30 | } |
32 | 31 | ||