[oe-commits] org.oe.dev merge of '0392f48f534dce561d4b8cb01e8db5ad64500222'

rpurdie commit openembedded-commits at lists.openembedded.org
Thu Feb 28 18:28:12 UTC 2008


merge of '0392f48f534dce561d4b8cb01e8db5ad64500222'
     and 'a141267452dde7cd1e229a81095e09d64b4c3e9d'

Author: rpurdie at openembedded.org
Branch: org.openembedded.dev
Revision: 524fc96258564567524a1295bfdf65c2a25da5d7
ViewMTN: http://monotone.openembedded.org/revision/info/524fc96258564567524a1295bfdf65c2a25da5d7
Files:
1
packages/ark3116/ark3116_0.4.1.bb
packages/callweaver/callweaver_1.2.0-rc5.bb
packages/dejagnu/dejagnu-qemu_1.0.bb
packages/dtnrg/dtn_2.5.0.bb
packages/emacs/emacs_cvs.bb
packages/erlang/erlang_R11B.1.bb
packages/gpephone/linphone_1.5.0.bb
packages/gpgme/gpgme.inc
packages/gxine/gxine_0.4.1.bb
packages/gxine/gxine_0.4.1enhanced.bb
packages/konqueror/konqueror-embedded_20060404.bb
packages/konqueror/konqueror-embedded_20070212.bb
packages/libaio/libaio_0.3.103.bb
packages/libxslt/libxslt_1.1.17.bb
packages/linphone/linphone_1.3.99.8.bb
packages/linphone/linphone_1.6.0.bb
packages/ltrace/ltrace_0.4.bb
packages/maemo/xpext_1.0-5.bb
packages/maemo/xsp_1.0.0-8.bb
packages/mpfr/mpfr_2.1.1.bb
packages/mpfr/mpfr_2.3.0.bb
packages/mpfr/mpfr_svn.bb
packages/netatalk/netatalk_2.0.3.bb
packages/pax-utils/pax-utils-native_0.1.13.bb
packages/php/php_5.2.0.bb
packages/pwc/pwc_10.0.12-rc1.bb
packages/radlib/radlib-mysql.inc
packages/radlib/radlib.inc
packages/roadster/roadster_cvs.bb
packages/skippy/skippy-xd_0.5.0.bb
packages/sox/sox-native_13.0.0.bb
conf/distro/include/sane-srcrevs.inc
packages/gcc/gcc_4.2.2.bb
Diffs:

#
# mt diff -r0392f48f534dce561d4b8cb01e8db5ad64500222 -r524fc96258564567524a1295bfdf65c2a25da5d7
#
# 
# 
# patch "packages/ark3116/ark3116_0.4.1.bb"
#  from [04996cc8748fe065be0d70923860ea32a7fd81d2]
#    to [6ac28543ae169d37814cf2c5863fc01180ddf41d]
# 
# patch "packages/callweaver/callweaver_1.2.0-rc5.bb"
#  from [ee0289ba433af46423d96382dc196aed501bbf1c]
#    to [bf883304dc67e8c662b012b40c85817b528b5d3f]
# 
# patch "packages/dejagnu/dejagnu-qemu_1.0.bb"
#  from [0d9481f4a17574b3bc6f890b7370c32f579003c2]
#    to [683934095c162c68f0ec5b88e056abf9dfa0ba9c]
# 
# patch "packages/dtnrg/dtn_2.5.0.bb"
#  from [f21e25b094f74aa1f1eba88ec1f6bcec6045077c]
#    to [6269e792c57585a4f83b60ebe3aea65892143a86]
# 
# patch "packages/emacs/emacs_cvs.bb"
#  from [3aa46cad86255469e86d4335acb761ff26758023]
#    to [3fcedbded9691ac85cd689abebc51f2417dc8fe0]
# 
# patch "packages/erlang/erlang_R11B.1.bb"
#  from [c84ac3e81c188f042c98ad27b508cb06878e37a6]
#    to [490ef18f3db5feb8c2445fc922367910ed3b7783]
# 
# patch "packages/gpephone/linphone_1.5.0.bb"
#  from [06011c047a001c6f25d8e4f565fb3ed2e25f7595]
#    to [31e3201cfed20ecfce70a2e1c67934d800bc60c8]
# 
# patch "packages/gpgme/gpgme.inc"
#  from [b13cccb8a5bee784f86c9e8c266b18f6ca87022b]
#    to [36ab592ddc0e1147ff7e3515f783b2f135903201]
# 
# patch "packages/gxine/gxine_0.4.1.bb"
#  from [8960aa965527e6ef1a77efb0878e52138f66b7a4]
#    to [66166c308e1752f6ae6835f1d50699c6592c9240]
# 
# patch "packages/gxine/gxine_0.4.1enhanced.bb"
#  from [7cd9d8702ca855a7b74febcbb2fb51bc4125c99a]
#    to [3190f0f6048ed1a8ccf3aa6ccd93c96a4ead8f8f]
# 
# patch "packages/konqueror/konqueror-embedded_20060404.bb"
#  from [a95f7772113b22b1006258f45427849bb88ac5c9]
#    to [4bd4dc00d00146a5c592875e547e7e81a174c825]
# 
# patch "packages/konqueror/konqueror-embedded_20070212.bb"
#  from [4b7b9152573fa0cb5af1e59387644f90358278dc]
#    to [6e24fc121d123e76770ab74b853705ff5b790e98]
# 
# patch "packages/libaio/libaio_0.3.103.bb"
#  from [b9249381e7085f91ba58f1d33331200d3e448453]
#    to [7f98e68099436c29270432af2bca0e073342245b]
# 
# patch "packages/libxslt/libxslt_1.1.17.bb"
#  from [930ca00ca2f48ef84fb13e81cfcb4504680eb6c9]
#    to [1961b7bc9bcf1d42fe3e6eb34691f7286b23107b]
# 
# patch "packages/linphone/linphone_1.3.99.8.bb"
#  from [075eb2f5c3aa3300f3343660141883a32e4e68dc]
#    to [fadf3dd56dd5deef9baecbcf9a52ac8bca0e4646]
# 
# patch "packages/linphone/linphone_1.6.0.bb"
#  from [12fa57bdfc35f887f98bd8c835b566f34d02f011]
#    to [8fdd4b224bf78001766099eb55bca18c72875d94]
# 
# patch "packages/ltrace/ltrace_0.4.bb"
#  from [0afb57078b5e4b319c5c6f3b602321bf65f6ea65]
#    to [6e2c3ad590a42759e1095fd40763189000dc02d1]
# 
# patch "packages/maemo/xpext_1.0-5.bb"
#  from [57bd673cacfc8db18925885216e8e5e57f44b5be]
#    to [f3a84714123f09b46679b12df43e6b83bfb3e01e]
# 
# patch "packages/maemo/xsp_1.0.0-8.bb"
#  from [d9a79489682141e292a24eba759a7cc8149700b9]
#    to [ac99c39e28167509baa24b93d94cf785601ee73a]
# 
# patch "packages/mpfr/mpfr_2.1.1.bb"
#  from [b78e94d2b43763f6e47c6d80d1253e12cdd7be4a]
#    to [513e45de2002bc218ebb071530576e44ba9b4706]
# 
# patch "packages/mpfr/mpfr_2.3.0.bb"
#  from [6b48dfd071b1323f69f1aa09faf6ac6a3ab1a06f]
#    to [b20fb238456f28535fb57b617caa5604cb87c127]
# 
# patch "packages/mpfr/mpfr_svn.bb"
#  from [bc40031a3b64de197388fcd8523b7442272a8873]
#    to [8a57dfe812c56c5686cbff3026c2f1ceb1689f4b]
# 
# patch "packages/netatalk/netatalk_2.0.3.bb"
#  from [7ede53ec4a1d181c30789368b6a67f4163abf5d4]
#    to [5c5d78936d965df7e139347c3b831c695e84a7f9]
# 
# patch "packages/pax-utils/pax-utils-native_0.1.13.bb"
#  from [d6f85d4805d38c1ecc0f4a1974444380619ed152]
#    to [2769fe2cff5308efab9484c95ee1a94398cd2fa4]
# 
# patch "packages/php/php_5.2.0.bb"
#  from [a163ebe31efaf24ca70addf00fa32e5b9c85c89a]
#    to [3c1f63cc7326dce0a534438bf37d88728f3048ec]
# 
# patch "packages/pwc/pwc_10.0.12-rc1.bb"
#  from [4e196bbd4879815efc74f59f9e3a1400ef65efc0]
#    to [8b342c8d986eef894c9bd0078a375b9a2d21727e]
# 
# patch "packages/radlib/radlib-mysql.inc"
#  from [4ca3a9d43e735173c035e6d6a0970e8211040c09]
#    to [d26d9ea097fcd700f44eea49fa844a8a436c133a]
# 
# patch "packages/radlib/radlib.inc"
#  from [022eda6c17dfe20004396c7b23362d65803c3503]
#    to [c9156d913a06422e4c0da7414223276d6146897b]
# 
# patch "packages/roadster/roadster_cvs.bb"
#  from [f4155fbfca56cff5d579af457509f0d502da631b]
#    to [594db1cb996e505c3b14f62eb3a48b5271d8d401]
# 
# patch "packages/skippy/skippy-xd_0.5.0.bb"
#  from [c0f9fbe37575c1403a668c8e05fe6ffe5d45d4af]
#    to [ff5208f6fdc7c8dc791b90771c6923e51fa6011e]
# 
# patch "packages/sox/sox-native_13.0.0.bb"
#  from [e68db293ebf4ade3f81ddca28a1397483e646eab]
#    to [9568812c2cfbd7569af7f233013e4386ec7f32d6]
# 
============================================================
--- packages/ark3116/ark3116_0.4.1.bb	04996cc8748fe065be0d70923860ea32a7fd81d2
+++ packages/ark3116/ark3116_0.4.1.bb	6ac28543ae169d37814cf2c5863fc01180ddf41d
@@ -25,8 +25,8 @@ EXTRA_OEMAKE = "'V=1' 'CFLAGS=${CFLAGS}'
                 'LD=${KERNEL_LD}' \
                 'KDIR=${STAGING_KERNEL_DIR}'"
 
-export TARGET_LDFLAGS = "-L${STAGING_DIR}/${TARGET_SYS}/lib \
-                         -Wl,-rpath-link,${STAGING_DIR}/${TARGET_SYS}/lib"
+export TARGET_LDFLAGS = "-L${STAGING_DIR_TARGET}${layout_libdir} \
+                         -Wl,-rpath-link,${STAGING_DIR_TARGET}${layout_libdir}"
 
 do_install() {
         install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/serial
============================================================
--- packages/callweaver/callweaver_1.2.0-rc5.bb	ee0289ba433af46423d96382dc196aed501bbf1c
+++ packages/callweaver/callweaver_1.2.0-rc5.bb	bf883304dc67e8c662b012b40c85817b528b5d3f
@@ -29,9 +29,9 @@ inherit autotools update-rc.d
 
 inherit autotools update-rc.d
 
-EXTRA_OECONF = " --with-ssl=${STAGING_DIR}/${HOST_SYS} --enable-low_memory \
+EXTRA_OECONF = " --with-ssl=${STAGING_DIR_HOST}${layout_exec_prefix} --enable-low_memory \
         --disable-zaptel --with-directory-layout=lsb --enable-t38 \
-        --with-codec-speex=${STAGING_DIR}/${HOST_SYS} \
+        --with-codec-speex=${STAGING_DIR_HOST}${layout_exec_prefix} \
         --with-perl-shebang='#!${bindir}/perl' --with-jabber --with-res_jabber \
         --with-javascript --with-res_js \
         --bindir=${bindir} --datadir=${datadir} --sysconfdir=${sysconfdir} \
============================================================
--- packages/dejagnu/dejagnu-qemu_1.0.bb	0d9481f4a17574b3bc6f890b7370c32f579003c2
+++ packages/dejagnu/dejagnu-qemu_1.0.bb	683934095c162c68f0ec5b88e056abf9dfa0ba9c
@@ -13,7 +13,7 @@ do_stage() {
 	install -m 0644 ${WORKDIR}/arm-qemu.exp ${STAGING_DATADIR}/dejagnu/baseboards/
 	cat <<EOF >${STAGING_BINDIR_NATIVE}/${QEMU}-test-wrapper
 #!/bin/sh
-exec ${QEMU} ${CROSS_DIR}/${TARGET_SYS}/${LD_SO} --library-path ${CROSS_DIR}/${TARGET_SYS}/lib:${STAGING_DIR}/${TARGET_SYS}/lib \$1
+exec ${QEMU} ${CROSS_DIR}/${TARGET_SYS}/${LD_SO} --library-path ${CROSS_DIR}/${TARGET_SYS}/lib:${STAGING_DIR_TARGET}${layout_libdir} \$1
 EOF
 	chmod 755 ${STAGING_BINDIR_NATIVE}/arm-qemu-test-wrapper
 }
============================================================
--- packages/dtnrg/dtn_2.5.0.bb	f21e25b094f74aa1f1eba88ec1f6bcec6045077c
+++ packages/dtnrg/dtn_2.5.0.bb	6269e792c57585a4f83b60ebe3aea65892143a86
@@ -1,31 +1,32 @@ LICENSE = "Apache"
 DESCRIPTION = "Delay Tolerant Networking Package"
 HOMEPAGE = "http://www.dtnrg.org/wiki"
 SECTION = "libs"
 DEPENDS = "db openssl python-native xerces-c"
 LICENSE = "Apache"
-SRC_URI = "http://www.dtnrg.org/docs/code/dtn_${PV}.tgz"
-PR = "r2"
+SRC_URI = "http://www.dtnrg.org/docs/code/dtn_${PV}.tgz \
+           file://configure_fix.patch;patch=1"
+PR = "r3"
 
 inherit autotools
 
 EXTRA_OECONF = "\
   --with-python=${STAGING_BINDIR_NATIVE}/python \
-  --with-db=${STAGING_DIR} \
-  --with-tcl=${STAGING_DIR} \
+  --with-db=${STAGING_DIR_HOST}${layout_exec_prefix} \
+  --with-tcl=${STAGING_DIR_HOST}${layout_exec_prefix} \
   --without-google-perftools \
   --without-bluez \
   --without-bonjour \
-  --with-expat=${STAGING_DIR} \
-  --with-xerces-c=${STAGING_DIR} \
+  --with-expat=${STAGING_DIR_HOST}${layout_exec_prefix} \
+  --with-xerces-c=${STAGING_DIR_HOST}${layout_exec_prefix} \
   --without-tclreadline \
-  --with-zlib=${STAGING_DIR} \
+  --with-zlib=${STAGING_DIR_HOST}${layout_exec_prefix} \
   --without-xsd-tool \
-  --with-db=${STAGING_DIR} \
+  --with-db=${STAGING_DIR_HOST}${layout_exec_prefix} \
   --enable-ecl \
   --enable-edp \
   --without-mysql \
   --without-postgres \
-  --with-openssl=${STAGING_DIR} \
+  --with-openssl=${STAGING_DIR_HOST}${layout_exec_prefix} \
 "
 
 def dtn_python_dir(d):
============================================================
--- packages/emacs/emacs_cvs.bb	3aa46cad86255469e86d4335acb761ff26758023
+++ packages/emacs/emacs_cvs.bb	3fcedbded9691ac85cd689abebc51f2417dc8fe0
@@ -26,7 +26,7 @@ FILES_${PN} += "${datadir}/emacs"
 
 FILES_${PN} += "${datadir}/emacs"
 
-QEMU = "qemu-${TARGET_ARCH} -L ${STAGING_DIR}/${TARGET_SYS}"
+QEMU = "qemu-${TARGET_ARCH} -L ${STAGING_DIR_TARGET}"
 LDFLAGS += "-L${CROSS_DIR}/${TARGET_SYS}/lib"
 
 EXTRA_OECONF = "--without-sound --without-x"
============================================================
--- packages/erlang/erlang_R11B.1.bb	c84ac3e81c188f042c98ad27b508cb06878e37a6
+++ packages/erlang/erlang_R11B.1.bb	490ef18f3db5feb8c2445fc922367910ed3b7783
@@ -11,7 +11,7 @@ EXTRA_OEMAKE = "BUILD_CC='${BUILD_CC}'"
 
 EXTRA_OEMAKE = "BUILD_CC='${BUILD_CC}'"
 
-EXTRA_OECONF = "--with-ssl=${STAGING_DIR}/${HOST_SYS}"
+EXTRA_OECONF = "--with-ssl=${STAGING_DIR_HOST}${layout_exec_prefix}"
 
 EXTRA_OECONF_append_arm = " --disable-smp-support --disable-hipe"
 EXTRA_OECONF_append_armeb = " --disable-smp-support --disable-hipe"
============================================================
--- packages/gpephone/linphone_1.5.0.bb	06011c047a001c6f25d8e4f565fb3ed2e25f7595
+++ packages/gpephone/linphone_1.5.0.bb	31e3201cfed20ecfce70a2e1c67934d800bc60c8
@@ -15,8 +15,8 @@ EXTRA_OECONF = "--disable-gnome_ui --dis
 
 EXTRA_OECONF = "--disable-gnome_ui --disable-gtk-doc --without-ffmpeg \
                 --without-sdl --disable-video --enable-alsa \
-                --with-osip=${STAGING_DIR}/${HOST_SYS} \
-                --with-readline=${STAGING_DIR}/${HOST_SYS} \
+                --with-osip=${STAGING_DIR_HOST}${layout_exec_prefix} \
+                --with-readline=${STAGING_DIR_HOST}${layout_exec_prefix} \
                 --disable-truespeech --disable-manual \
                 --disable-glibtest --disable-glib --disable-strict"
 
============================================================
--- packages/gpgme/gpgme.inc	b13cccb8a5bee784f86c9e8c266b18f6ca87022b
+++ packages/gpgme/gpgme.inc	36ab592ddc0e1147ff7e3515f783b2f135903201
@@ -5,7 +5,7 @@ SRC_URI = "ftp://ftp.gnupg.org/gcrypt/gp
 
 SRC_URI = "ftp://ftp.gnupg.org/gcrypt/gpgme/gpgme-${PV}.tar.gz"
 
-EXTRA_OECONF = "--with-pth=${STAGING_DIR}/${HOST_SYS} --without-pth-test --with-gpg=${bindir}/gpg --without-gpgsm"
+EXTRA_OECONF = "--with-pth=${STAGING_DIR_HOST}${layout_exec_prefix} --without-pth-test --with-gpg=${bindir}/gpg --without-gpgsm"
 
 LEAD_SONAME = "libgpgme.so"
 
============================================================
--- packages/gxine/gxine_0.4.1.bb	8960aa965527e6ef1a77efb0878e52138f66b7a4
+++ packages/gxine/gxine_0.4.1.bb	66166c308e1752f6ae6835f1d50699c6592c9240
@@ -36,7 +36,7 @@ EXTRA_OECONF = " --includedir=${STAGING_
 EXTRA_OECONF = " --includedir=${STAGING_INCDIR} \
 		--libdir=${STAGING_LIBDIR} \
 		--disable-xinetest \
-		--with-xine-prefix=${STAGING_DIR}/${HOST_SYS}"
+		--with-xine-prefix=${STAGING_DIR_HOST}${layout_exec_prefix}"
 
 LDFLAGS += "-lxine"
 
============================================================
--- packages/gxine/gxine_0.4.1enhanced.bb	7cd9d8702ca855a7b74febcbb2fb51bc4125c99a
+++ packages/gxine/gxine_0.4.1enhanced.bb	3190f0f6048ed1a8ccf3aa6ccd93c96a4ead8f8f
@@ -39,7 +39,7 @@ EXTRA_OECONF = " --includedir=${STAGING_
 EXTRA_OECONF = " --includedir=${STAGING_INCDIR} \
 		--libdir=${STAGING_LIBDIR} \
 		--disable-xinetest \
-		--with-xine-prefix=${STAGING_DIR}/${HOST_SYS}"
+		--with-xine-prefix=${STAGING_DIR_HOST}${layout_exec_prefix}"
 
 LDFLAGS += "-lxine"
 
============================================================
--- packages/konqueror/konqueror-embedded_20060404.bb	a95f7772113b22b1006258f45427849bb88ac5c9
+++ packages/konqueror/konqueror-embedded_20060404.bb	4bd4dc00d00146a5c592875e547e7e81a174c825
@@ -35,9 +35,9 @@ EXTRA_OECONF = '--prefix=${palmtopdir} \
 	--with-extra-includes=${STAGING_INCDIR} \
 	--with-extra-libs=${STAGING_LIBDIR} \
 	--with-ssl-version=0.9.7e \
-	--with-ssl-dir=${STAGING_LIBDIR}/.. \
-	--with-qt-includes=${STAGING_DIR}/${HOST_SYS}/qt2/include \
-	--with-qt-libraries=${STAGING_DIR}/${HOST_SYS}/qt2/lib \
+	--with-ssl-dir=${STAGING_DIR_HOST}${layout_exec_prefix} \
+	--with-qt-includes=${STAGING_DIR_HOST}/qt2/include \
+	--with-qt-libraries=${STAGING_DIR_HOST}/qt2/lib \
 	--enable-fontsubs \
 	--with-konq-tmp-prefix=/tmp/kde-cache \
 #	--enable-static \
============================================================
--- packages/konqueror/konqueror-embedded_20070212.bb	4b7b9152573fa0cb5af1e59387644f90358278dc
+++ packages/konqueror/konqueror-embedded_20070212.bb	6e24fc121d123e76770ab74b853705ff5b790e98
@@ -36,9 +36,9 @@ EXTRA_OECONF = '--prefix=${palmtopdir} \
 	--with-extra-libs=${STAGING_LIBDIR} \
 	--with-qtopia-dir=${OPIEDIR} \
 	--with-ssl-version=0.9.7e \
-	--with-ssl-dir=${STAGING_LIBDIR}/.. \
-	--with-qt-includes=${STAGING_DIR}/${HOST_SYS}/qt2/include \
-	--with-qt-libraries=${STAGING_DIR}/${HOST_SYS}/qt2/lib \
+	--with-ssl-dir=${STAGING_DIR_HOST}${layout_exec_prefix} \
+	--with-qt-includes=${STAGING_DIR_HOST}/qt2/include \
+	--with-qt-libraries=${STAGING_DIR_HOST}/qt2/lib \
 	--with-qt-dir=${QTDIR} \
 	--enable-fontsubs \
 	--with-konq-tmp-prefix=/tmp/kde-cache \
============================================================
--- packages/libaio/libaio_0.3.103.bb	b9249381e7085f91ba58f1d33331200d3e448453
+++ packages/libaio/libaio_0.3.103.bb	7f98e68099436c29270432af2bca0e073342245b
@@ -26,8 +26,8 @@ do_stage () {
 }
 
 do_stage () {
-	#make install prefix='${STAGING_DIR}/${TARGET_SYS}'
-        install -D -m 644 src/libaio.h ${STAGING_DIR}/${TARGET_SYS}/include/libaio.h
+	#make install prefix='${STAGING_DIR_TARGET}${layout_prefix}'
+        install -D -m 644 src/libaio.h ${STAGING_INCDIR}/libaio.h
 	oe_libinstall -so -C src libaio ${STAGING_LIBDIR}
 
 }
============================================================
--- packages/libxslt/libxslt_1.1.17.bb	930ca00ca2f48ef84fb13e81cfcb4504680eb6c9
+++ packages/libxslt/libxslt_1.1.17.bb	1961b7bc9bcf1d42fe3e6eb34691f7286b23107b
@@ -32,8 +32,8 @@ do_stage () {
 		install -m 0644 ${S}/libexslt/$i ${STAGING_INCDIR}/libexslt/$i
 	done
 
-	cat xslt-config | sed -e "s,^prefix=.*,prefix=${STAGING_DIR}/${HOST_SYS}," \
-		       	     -e "s,^exec_prefix=.*,exec_prefix=${STAGING_DIR}/${HOST_SYS}," \
+	cat xslt-config | sed -e "s,^prefix=.*,prefix=${STAGING_DIR_HOST}${layout_prefix}," \
+		       	     -e "s,^exec_prefix=.*,exec_prefix=${STAGING_DIR_HOST}${layout_exec_prefix}," \
 			     -e "s,^includedir=.*,includedir=${STAGING_INCDIR}," \
 			     -e "s,^libdir=.*,libdir=${STAGING_LIBDIR}," > ${STAGING_BINDIR_CROSS}/xslt-config
 	chmod a+rx ${STAGING_BINDIR_CROSS}/xslt-config
============================================================
--- packages/linphone/linphone_1.3.99.8.bb	075eb2f5c3aa3300f3343660141883a32e4e68dc
+++ packages/linphone/linphone_1.3.99.8.bb	fadf3dd56dd5deef9baecbcf9a52ac8bca0e4646
@@ -15,9 +15,9 @@ EXTRA_OECONF = "--disable-gnome_ui --dis
 
 EXTRA_OECONF = "--disable-gnome_ui --disable-gtk-doc --without-ffmpeg \
                 --without-sdl --disable-video --enable-alsa \
-                --with-osip=${STAGING_DIR}/${HOST_SYS} \
-                --with-readline=${STAGING_DIR}/${HOST_SYS} \
-                --with-speex=${STAGING_DIR}/${HOST_SYS} \
+                --with-osip=${STAGING_DIR_HOST}${layout_exec_prefix} \
+                --with-readline=${STAGING_DIR_HOST}${layout_exec_prefix} \
+                --with-speex=${STAGING_DIR_HOST}${layout_exec_prefix} \
                 --disable-truespeech --disable-manual \
                 --disable-glibtest --disable-glib"
 
============================================================
--- packages/linphone/linphone_1.6.0.bb	12fa57bdfc35f887f98bd8c835b566f34d02f011
+++ pa%s
>>> DIFF TRUNCATED @ 16K


#
# mt diff -ra141267452dde7cd1e229a81095e09d64b4c3e9d -r524fc96258564567524a1295bfdf65c2a25da5d7
#
# 
# 
# patch "conf/distro/include/sane-srcrevs.inc"
#  from [426c0d5c30aa55ac9f2a23243ba2605968d2f3be]
#    to [66423fdd2da04384c51e77181591011dce4180fa]
# 
# patch "packages/gcc/gcc_4.2.2.bb"
#  from [71f991a05f98b5c132567ed6c4ab496016222a4f]
#    to [8fcbf0f98f7f23e93b4fb6bb643e11c81f1390e1]
# 
============================================================
--- conf/distro/include/sane-srcrevs.inc	426c0d5c30aa55ac9f2a23243ba2605968d2f3be
+++ conf/distro/include/sane-srcrevs.inc	66423fdd2da04384c51e77181591011dce4180fa
@@ -31,8 +31,7 @@ SRCREV_pn-gpe-contacts ?= "9312"
 SRCREV_pn-gconf-dbus ?= "641"
 SRCREV_pn-gnuradio ?= "6377"
 SRCREV_pn-gpe-contacts ?= "9312"
-SRCREV_pn-gpio ?= "4112"
-SRCREV_pn-gsm0710muxd ?= "77"
+SRCREV_pn-gsm0710muxd ?= "85"
 SRCREV_pn-gtkhtml2 ?= "1158"
 SRCREV_pn-gypsy ?= "56"
 SRCREV_pn-hildon-1 ?= "14429"
@@ -135,11 +134,12 @@ SRCREV_pn-psplash ?= "249"
 SRCREV_pn-opkg-native ?= "4019"
 SRCREV_pn-oprofileui ?= "160"
 SRCREV_pn-psplash ?= "249"
-SRCREV_pn-pyneod ?= "83"
-SRCREV_pn-pyneog ?= "83"
+SRCREV_pn-pyneod ?= "85"
+SRCREV_pn-pyneog ?= "85"
 SRCREV_pn-python-formencode = "3148"
 SRCREV_pn-python-gsmd = "127"
 SRCREV_pn-python-lightmediascanner = "68"
+SRCREV_pn-s3c24xx-gpio ?= "4130"
 SRCREV_pn-settings-daemon ?= "1755"
 SRCREV_pn-sjf2410-linux-native ?= "933"
 SRCREV_pn-sphyrna ?= "45"
============================================================
--- packages/gcc/gcc_4.2.2.bb	71f991a05f98b5c132567ed6c4ab496016222a4f
+++ packages/gcc/gcc_4.2.2.bb	8fcbf0f98f7f23e93b4fb6bb643e11c81f1390e1
@@ -1,8 +1,8 @@ LICENSE = "GPL"
 DESCRIPTION = "The GNU cc and gcc C compilers."
 HOMEPAGE = "http://www.gnu.org/software/gcc/"
 SECTION = "devel"
 LICENSE = "GPL"
-PR = "r4"
+PR = "r5"
 
 inherit autotools gettext
 






More information about the Openembedded-commits mailing list