[oe-commits] org.oe.dev merge of '81786bc5eee231cdb9c16dff4db1629456df1461'
crofton commit
openembedded-commits at lists.openembedded.org
Tue Jul 24 17:52:57 UTC 2007
merge of '81786bc5eee231cdb9c16dff4db1629456df1461'
and 'e23d2e22f6c7c6ea4e507a9c6642f0c2d78b4129'
Author: crofton at openembedded.org
Branch: org.openembedded.dev
Revision: 5624487eb13b978b5a6cb83c78e6a60a5d481422
ViewMTN: http://monotone.openembedded.org/revision.psp?id=5624487eb13b978b5a6cb83c78e6a60a5d481422
Files:
1
packages/pkgconfig/pkgconfig-0.22
packages/pkgconfig/pkgconfig-0.22/glibconfig-sysdefs.h
packages/pkgconfig/pkgconfig-native_0.22.bb
packages/pkgconfig/pkgconfig_0.22.bb
packages/python/python-pyrex-native_0.9.3.1.bb
packages/python/python-pyrex-native_0.9.5.1a.bb
packages/python/python-pyrex_0.9.3.1.bb
packages/python/python-pyrex_0.9.5.1a.bb
packages/python/python-setuptools_0.6c5.bb
packages/python/python-setuptools_0.6c6.bb
packages/networkmanager/networkmanager_svn.bb
packages/python/python-ecore_cvs.bb
packages/python/python-edje_cvs.bb
packages/python/python-efl.inc
packages/python/python-emotion_cvs.bb
packages/python/python-evas_cvs.bb
classes/distutils-base.bbclass
classes/distutils.bbclass
packages/libpcre/libpcre_4.4.bb
packages/python/python-simplejson_1.7.1.bb
packages/ruby/ruby_1.8.5.bb
packages/tasks/task-base.bb
packages/tasks/task-python-everything_20060425.bb
packages/webkit/webkit/WebKit.pri
packages/webkit/webkit/WebKit.pro
packages/webkit/webkit_svn.bb
Diffs:
#
# mt diff -r81786bc5eee231cdb9c16dff4db1629456df1461 -r5624487eb13b978b5a6cb83c78e6a60a5d481422
#
#
#
# add_dir "packages/pkgconfig/pkgconfig-0.22"
#
# add_file "packages/pkgconfig/pkgconfig-0.22/glibconfig-sysdefs.h"
# content [372a1bb7b434a2d33536de584a8e41604dd5fe1e]
#
# add_file "packages/pkgconfig/pkgconfig-native_0.22.bb"
# content [1ae6b78461b7b7a18e01e9bcfb1f8cf40d0a313d]
#
# add_file "packages/pkgconfig/pkgconfig_0.22.bb"
# content [fffbd20e4754ed405bc7f24d8eacec693adf09f7]
#
============================================================
--- packages/pkgconfig/pkgconfig-0.22/glibconfig-sysdefs.h 372a1bb7b434a2d33536de584a8e41604dd5fe1e
+++ packages/pkgconfig/pkgconfig-0.22/glibconfig-sysdefs.h 372a1bb7b434a2d33536de584a8e41604dd5fe1e
@@ -0,0 +1,6 @@
+#define GLIB_SYSDEF_POLLIN =1
+#define GLIB_SYSDEF_POLLOUT =4
+#define GLIB_SYSDEF_POLLPRI =2
+#define GLIB_SYSDEF_POLLERR =8
+#define GLIB_SYSDEF_POLLHUP =16
+#define GLIB_SYSDEF_POLLNVAL =32
============================================================
--- packages/pkgconfig/pkgconfig-native_0.22.bb 1ae6b78461b7b7a18e01e9bcfb1f8cf40d0a313d
+++ packages/pkgconfig/pkgconfig-native_0.22.bb 1ae6b78461b7b7a18e01e9bcfb1f8cf40d0a313d
@@ -0,0 +1,7 @@
+SECTION = "console/utils"
+require pkgconfig_${PV}.bb
+FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/pkgconfig-${PV}"
+
+S = "${WORKDIR}/pkg-config-${PV}/"
+inherit native
+DEPENDS = ""
============================================================
--- packages/pkgconfig/pkgconfig_0.22.bb fffbd20e4754ed405bc7f24d8eacec693adf09f7
+++ packages/pkgconfig/pkgconfig_0.22.bb fffbd20e4754ed405bc7f24d8eacec693adf09f7
@@ -0,0 +1,30 @@
+SECTION = "console/utils"
+DESCRIPTION = "pkg-config is a system for managing library \
+compile/link flags that works with automake and autoconf. \
+It replaces the ubiquitous *-config scripts you may have \
+seen with a single tool."
+HOMEPAGE = "http://pkg-config.freedesktop.org/wiki/"
+LICENSE = "GPL"
+PR = "r0"
+
+DEFAULT_PREFERENCE = "-1"
+
+SRC_URI = "http://pkgconfig.freedesktop.org/releases/pkg-config-${PV}.tar.gz \
+ file://glibconfig-sysdefs.h"
+
+S = "${WORKDIR}/pkg-config-${PV}/"
+
+inherit autotools
+
+acpaths = "-I ."
+do_configure () {
+ install -m 0644 ${WORKDIR}/glibconfig-sysdefs.h glib-1.2.8/
+ gnu-configize
+ libtoolize --force
+ oe_runconf
+}
+
+do_stage_prepend() {
+ install -d -m 0755 ${STAGING_DATADIR}/pkgconfig
+
+}
#
# mt diff -re23d2e22f6c7c6ea4e507a9c6642f0c2d78b4129 -r5624487eb13b978b5a6cb83c78e6a60a5d481422
#
#
#
# rename "packages/python/python-pyrex-native_0.9.3.1.bb"
# to "packages/python/python-pyrex-native_0.9.5.1a.bb"
#
# rename "packages/python/python-pyrex_0.9.3.1.bb"
# to "packages/python/python-pyrex_0.9.5.1a.bb"
#
# rename "packages/python/python-setuptools_0.6c5.bb"
# to "packages/python/python-setuptools_0.6c6.bb"
#
# add_file "packages/networkmanager/networkmanager_svn.bb"
# content [2a50cff7e9023cedbaa77252fbd4ff3c576130a8]
#
# add_file "packages/python/python-ecore_cvs.bb"
# content [fe5b297e24b83dbf229b9b82e7dae5b298db6094]
#
# add_file "packages/python/python-edje_cvs.bb"
# content [4341cf49e754ab2ea5a3da52a700d149d15bd85f]
#
# add_file "packages/python/python-efl.inc"
# content [6ac61900a9a6dedff63afcb55e931f9337453406]
#
# add_file "packages/python/python-emotion_cvs.bb"
# content [4ee831c347e68f89c519dce59308aca8cbb8015f]
#
# add_file "packages/python/python-evas_cvs.bb"
# content [643730b5cf660ec8fdedb50a18b9af6fb1834cee]
#
# patch "classes/distutils-base.bbclass"
# from [f35c9647052b9f8a19f0c3d2cbcf7b1b8523d810]
# to [91fb202ad3d377913b0616f94e38e0cc7e8c7804]
#
# patch "classes/distutils.bbclass"
# from [4ffee91258344c002afdeb8f9d4cac10e450d830]
# to [360816dccb4f857e2065ebda84f78fde86ff4b65]
#
# patch "packages/libpcre/libpcre_4.4.bb"
# from [ca59f09f77b43940632b37e34314a2f4d38349ca]
# to [984032d4632ad803f48b7e387b39cad745c99917]
#
# patch "packages/python/python-setuptools_0.6c6.bb"
# from [4225103b3cc96e75911321bcfd1ba59503f611fd]
# to [57994d92ba3eec5b7d6f145f3d08241becb3a6dc]
#
# patch "packages/python/python-simplejson_1.7.1.bb"
# from [551a3e4cb851a9cd206d9baf81a0c99e022b08a4]
# to [8890cca59935f213dfae3a402765e7bad90c9a89]
#
# patch "packages/ruby/ruby_1.8.5.bb"
# from [abb57d427cbbc11f4ff83d8dc8f53951a1066f8b]
# to [7544aec96e0f0bee56c8380879e7478a865e00f5]
#
# patch "packages/tasks/task-base.bb"
# from [2b89141c35420f2a2ec89ff47305e1e4034c4067]
# to [fe2979cb73be668163bfcc4d8438f2aef96d197b]
#
# patch "packages/tasks/task-python-everything_20060425.bb"
# from [a8dc821af98804a10e045281f3f05758bab88119]
# to [748d2af342f7a6130182e9007e85f0157e9e4a43]
#
# patch "packages/webkit/webkit/WebKit.pri"
# from [94510fbc949e86f0ce4710c19900c4a6a8c163a9]
# to [8dbdde1c26386f94aaaad0b70b380b22fe554a69]
#
# patch "packages/webkit/webkit/WebKit.pro"
# from [63fd1bd947de2d3abe6a011685e6173bf0a804e1]
# to [c4db9377c267835f4ec934a4d53207e26c25b99c]
#
# patch "packages/webkit/webkit_svn.bb"
# from [a579828b28b3be2c2c2b36f20643de557f0778dc]
# to [124f784a2e32f48ff79dc926a9bb0db2d47fcf66]
#
============================================================
--- packages/networkmanager/networkmanager_svn.bb 2a50cff7e9023cedbaa77252fbd4ff3c576130a8
+++ packages/networkmanager/networkmanager_svn.bb 2a50cff7e9023cedbaa77252fbd4ff3c576130a8
@@ -0,0 +1,70 @@
+DESCRIPTION = "NetworkManager"
+SECTION = "net/misc"
+LICENSE = "GPL"
+HOMEPAGE = "http://www.gnome.org"
+PRIORITY = "optional"
+DEPENDS = "libnl dbus dbus-glib hal gconf-dbus wireless-tools"
+RDEPENDS = "wpa-supplicant iproute2 dhcdbd"
+PV = "0.6.5+svn${SRCDATE}"
+
+PR = "r0"
+
+SRC_URI="svn://svn.gnome.org/svn/NetworkManager/branches;module=NETWORKMANAGER_0_6_0_RELEASE;proto=http \
+ file://NetworkManager \
+ file://99_networkmanager"
+
+DEFAULT_PREFERENCE = "-1"
+
+EXTRA_OECONF = " \
+ --with-gnome \
+ --with-distro=debian \
+ --without-gcrypt \
+ --with-wpa_supplicant=/usr/sbin/wpa_supplicant \
+ --with-dhcdbd=/sbin/dhcdbd \
+ --with-ip=/sbin/ip"
+
+S = "${WORKDIR}/NETWORKMANAGER_0_6_0_RELEASE"
+
+inherit autotools pkgconfig
+
+do_staging () {
+ autotools_stage_includes
+ oe_libinstall -C libnm-util libnm-util ${STAGING_LIBDIR}
+ oe_libinstall gnome/libnm_glib libnm_glib ${STAGING_LIBDIR}
+}
+
+do_install () {
+ oe_libinstall -C libnm-util libnm-util ${D}/usr/lib
+ oe_libinstall -C gnome/libnm_glib libnm_glib ${D}/usr/lib
+
+ oe_runmake -C src DESTDIR="${D}" install
+ install -d ${D}/etc/default/volatiles
+ install -m 0644 ${WORKDIR}/99_networkmanager ${D}/etc/default/volatiles
+ install -d ${D}/etc/init.d/
+ install -m 0755 ${WORKDIR}/NetworkManager ${D}/etc/init.d/
+ install -d ${D}/${datadir}/
+}
+
+pkg_postinst_${PN} () {
+if [ "x$D" != "x" ]; then
+ exit 1
+fi
+/etc/init.d/populate-volatile.sh update
+}
+
+PACKAGES =+ "libnmutil libnmglib"
+
+FILES_libnmutil += "${libdir}/libnm-util.so.*"
+FILES_libnmglib += "${libdir}/libnm_glib.so.*"
+
+FILES_${PN} += "${datadir} \
+ ${sbindir}/* \
+ ${bindir}/* \
+ ${sysconfdir} \
+ ${libexecdir}"
+
+FILES_${PN}-dev += "${incdir} \
+ ${libdir}/*.a \
+ ${libdir}/*.la \
+ ${libdir}/pkgconfig"
+
============================================================
--- packages/python/python-ecore_cvs.bb fe5b297e24b83dbf229b9b82e7dae5b298db6094
+++ packages/python/python-ecore_cvs.bb fe5b297e24b83dbf229b9b82e7dae5b298db6094
@@ -0,0 +1,3 @@
+require python-efl.inc
+
+DEPENDS += "ecore"
============================================================
--- packages/python/python-edje_cvs.bb 4341cf49e754ab2ea5a3da52a700d149d15bd85f
+++ packages/python/python-edje_cvs.bb 4341cf49e754ab2ea5a3da52a700d149d15bd85f
@@ -0,0 +1,4 @@
+require python-efl.inc
+
+DEPENDS += "edje python-evas"
+
============================================================
--- packages/python/python-efl.inc 6ac61900a9a6dedff63afcb55e931f9337453406
+++ packages/python/python-efl.inc 6ac61900a9a6dedff63afcb55e931f9337453406
@@ -0,0 +1,18 @@
+DESCRIPTION = "${PN} bindings"
+LICENSE = "BSD"
+AUTHOR = "Gustavo Sverzut Barbieri <barbieri at gmail.com>"
+HOMEPAGE = "http://www.enlightenment.org"
+DEPENDS = "python-pyrex-native python-numeric"
+PV = "0.0.0+cvs${SRCDATE}"
+
+inherit distutils
+
+SRC_URI = "${E_CVS};module=e17/proto/python-efl/${PN}"
+S = "${WORKDIR}/${PN}"
+
+do_install_append() {
+ rm ${D}${libdir}/${PYTHON_DIR}/site-packages/site.*
+}
+
+FILES_${PN}-dbg += "${libdir}/${PYTHON_DIR}/site-packages/*.egg/*/*/.debug"
+
============================================================
--- packages/python/python-emotion_cvs.bb 4ee831c347e68f89c519dce59308aca8cbb8015f
+++ packages/python/python-emotion_cvs.bb 4ee831c347e68f89c519dce59308aca8cbb8015f
@@ -0,0 +1,4 @@
+require python-efl.inc
+
+DEPENDS += "emotion python-evas"
+
============================================================
--- packages/python/python-evas_cvs.bb 643730b5cf660ec8fdedb50a18b9af6fb1834cee
+++ packages/python/python-evas_cvs.bb 643730b5cf660ec8fdedb50a18b9af6fb1834cee
@@ -0,0 +1,13 @@
+require python-efl.inc
+
+DEPENDS += "evas"
+
+do_stage() {
+ distutils_stage_headers
+}
+
+#do_stage_append() {
+# install -d ${STAGING_DIR}/${BUILD_SYS}/include/${PYTHON_DIR}/python-evas/
+# install -m 0644 evas/evas.c_evas.pxd ${STAGING_DIR}/${BUILD_SYS}/include/${PYTHON_DIR}/python-evas/
+#}
+
============================================================
--- classes/distutils-base.bbclass f35c9647052b9f8a19f0c3d2cbcf7b1b8523d810
+++ classes/distutils-base.bbclass 91fb202ad3d377913b0616f94e38e0cc7e8c7804
@@ -12,6 +12,7 @@ FILES_${PN} = "${bindir}/* ${libdir}/* $
PYTHON_DIR = "${@python_dir(d)}"
FILES_${PN} = "${bindir}/* ${libdir}/* ${libdir}/${PYTHON_DIR}/*"
-FILES_${PN}-dbg = "${libdir}/${PYTHON_DIR}/site-packages/*/.debug \
- ${libdir}/${PYTHON_DIR}/site-packages/.debug"
+FILES_${PN}-dbg = "${libdir}/${PYTHON_DIR}/site-packages/.debug \
+ ${libdir}/${PYTHON_DIR}/site-packages/./*/debug \
+ ${libdir}/${PYTHON_DIR}/site-packages/*/*/.debug"
============================================================
--- classes/distutils.bbclass 4ffee91258344c002afdeb8f9d4cac10e450d830
+++ classes/distutils.bbclass 360816dccb4f857e2065ebda84f78fde86ff4b65
@@ -1,15 +1,23 @@ distutils_do_compile() {
inherit distutils-base
distutils_do_compile() {
- BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
- ${STAGING_BINDIR_NATIVE}/python setup.py build || \
- oefatal "python setup.py build execution failed."
+ BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
+ ${STAGING_BINDIR_NATIVE}/python setup.py build || \
+ oefatal "python setup.py build_ext execution failed."
}
+distutils_stage_headers() {
+ BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
+ ${STAGING_BINDIR_NATIVE}/python setup.py install_headers --install-dir=${STAGING_INCDIR}/${PYTHON_DIR} || \
+ oefatal "python setup.py install execution failed."
+}
+
distutils_do_install() {
- BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
- ${STAGING_BINDIR_NATIVE}/python setup.py install --prefix=${D}/${prefix} --install-data=${D}/${datadir} || \
- oefatal "python setup.py install execution failed."
+ install -d ${D}${libdir}/${PYTHON_DIR}/site-packages
+ PYTHONPATH=${D}/${libdir}/${PYTHON_DIR}/site-packages \
+ BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
+ ${STAGING_BINDIR_NATIVE}/python setup.py install --prefix=${D}/${prefix} --install-data=${D}/${datadir} || \
+ oefatal "python setup.py install execution failed."
for i in `find ${D} -name "*.py"` ; do \
sed -i -e s:${D}::g $i
============================================================
--- packages/libpcre/libpcre_4.4.bb ca59f09f77b43940632b37e34314a2f4d38349ca
+++ packages/libpcre/libpcre_4.4.bb 984032d4632ad803f48b7e387b39cad745c99917
@@ -5,7 +5,7 @@ SECTION = "devel"
themselves still follow Perl syntax and semantics. The header file for \
the POSIX-style functions is called pcreposix.h."
SECTION = "devel"
-PR = "r7"
+PR = "r8"
LICENSE = "BSD"
SRC_URI = "${SOURCEFORGE_MIRROR}/pcre/pcre-${PV}.tar.bz2"
S = "${WORKDIR}/pcre-${PV}"
@@ -37,7 +37,9 @@ do_stage () {
oe_libinstall -a -so libpcreposix ${STAGING_LIBDIR}
install -m 0644 pcre.h ${STAGING_INCDIR}/
install -m 0644 pcreposix.h ${STAGING_INCDIR}/
+ install -d ${STAGING_BINDIR_NATIVE}
+ install -m 0755 ${S}/dftables ${STAGING_BINDIR_NATIVE}/
}
-FILES_${PN} = "${libdir}/lib*.so*"
+FILES_${PN} = "${libdir}/lib*.so.*"
FILES_${PN}-dev += "${bindir}/*"
============================================================
--- packages/python/python-setuptools_0.6c5.bb 4225103b3cc96e75911321bcfd1ba59503f611fd
+++ packages/python/python-setuptools_0.6c6.bb 57994d92ba3eec5b7d6f145f3d08241becb3a6dc
@@ -5,7 +5,7 @@ SRCNAME = "setuptools"
LICENSE = "MIT-like"
RDEPENDS = "python-core python-zlib"
SRCNAME = "setuptools"
-PR = "r0"
+PR = "ml1"
SRC_URI = "http://cheeseshop.python.org/packages/source/s/setuptools/${SRCNAME}-${PV}.tar.gz"
S = "${WORKDIR}/${SRCNAME}-${PV}"
@@ -20,7 +20,3 @@ do_stage() {
BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
${STAGING_BINDIR_NATIVE}/python setup.py install
}
-
-# Deal with .pth file error
-export PYTHONPATH="${D}/${libdir}/${PYTHON_DIR}/site-packages"
-
============================================================
--- packages/python/python-simplejson_1.7.1.bb 551a3e4cb851a9cd206d9baf81a0c99e022b08a4
+++ packages/python/python-simplejson_1.7.1.bb 8890cca59935f213dfae3a402765e7bad90c9a89
@@ -8,17 +8,9 @@ SRCNAME = "simplejson"
# python-zlib is needed to unpack egg created by setuptools
RDEPENDS = "python-core python-re python-io python-netserver python-zlib"
SRCNAME = "simplejson"
-PR = "r0"
+PR = "r1"
SRC_URI = "http://cheeseshop.python.org/packages/source/s/simplejson/${SRCNAME}-${PV}.tar.gz"
S = "${WORKDIR}/${SRCNAME}-${PV}"
inherit distutils
-
-do_install_prepend() {
- install -d ${D}/${libdir}/${PYTHON_DIR}/site-packages
-}
-
-# Deal with .pth file error
-export PYTHONPATH="${D}/${libdir}/python2.4/site-packages"
-
============================================================
--- packages/ruby/ruby_1.8.5.bb abb57d427cbbc11f4ff83d8dc8f53951a1066f8b
+++ packages/ruby/ruby_1.8.5.bb 7544aec96e0f0bee56c8380879e7478a865e00f5
@@ -1,2 +1,8 @@ DEPENDS = "ruby-native zlib openssl"
require ruby.inc
DEPENDS = "ruby-native zlib openssl"
+
+PR = "r1"
+
+FILES_${PN}-dbg += "${libdir}/ruby/1.8/*/.debug \
+ ${libdir}/ruby/1.8/*/*/.debug"
+
============================================================
--- packages/tasks/task-base.bb 2b89141c35420f2a2ec89ff47305e1e4034c4067
+++ packages/tasks/task-base.bb fe2979cb73be668163bfcc4d8438f2aef96d197b
@@ -1,5 +1,5 @@ DESCRIPTION = "Merge machine and distro
DESCRIPTION = "Merge machine and distro options to create a basic machine task/package"
-PR = "r40"
+PR = "r41"
DEPENDS = "task-boot"
PROVIDES = "${PACKAGES}"
@@ -223,9 +223,13 @@ task-base-pcmcia26 = "\
${@base_contains('DISTRO_FEATURES', 'wifi', 'kernel-module-hostap-cs', '',d)} \
${@base_contains('DISTRO_FEATURES', 'wifi', 'kernel-module-spectrum-cs', '',d)}"
+# Provide bluez-utils-compat utils for the time being, the binaries in that package will vanish soon from upstream releases, so beware!
+
RDEPENDS_task-base-bluetooth = "\
blueprobe \
- bluez-utils"
+ bluez-utils \
+ bluez-utils-compat \
+ "
RRECOMMENDS_task-base-bluetooth = "\
kernel-module-bluetooth \
============================================================
--- packages/tasks/task-python-everything_20060425.bb a8dc821af98804a10e045281f3f05758bab88119
+++ packages/tasks/task-python-everything_20060425.bb 748d2af342f7a6130182e9007e85f0157e9e4a43
@@ -1,7 +1,7 @@ LICENSE = "MIT"
DESCRIPTION= "Everything Python"
HOMEPAGE = "http://www.vanille.de/projects/python.spy"
LICENSE = "MIT"
-PR = "ml13"
+PR = "ml14"
BROKEN_BECAUSE_GCC4 = "\
python-egenix-mx-base"
@@ -12,6 +12,10 @@ RDEPENDS = "\
python-constraint \
python-crypto \
python-dialog \
+ python-evas \
+ python-ecore \
+ python-emotion \
+ python-edje \
python-pycurl \
python-fam \
python-fnorb \
============================================================
--- packages/webkit/webkit/WebKit.pri 94510fbc949e86f0ce4710c19900c4a6a8c163a9
+++ packages/webkit/webkit/WebKit.pri 8dbdde1c26386f94aaaad0b70b380b22fe554a69
@@ -28,7 +28,9 @@ gdk-port:INCLUDEPATH += \
$$BASE_DIR/WebCore/platform/network/curl \
$$BASE_DIR/WebCore/platform/graphics/cairo \
$$BASE_DIR/WebCore/loader/gdk \
- $$BASE_DIR/WebCore/page/gdk
+ $$BASE_DIR/WebCore/page/gdk \
+ $$BASE_DIR/WebKit/gtk/Api \
+ $$BASE_DIR/WebKit/gtk/WebCoreSupport
INCLUDEPATH += \
$$BASE_DIR/JavaScriptCore/ \
$$BASE_DIR/JavaScriptCore/kjs \
============================================================
--- packages/webkit/webkit/WebKit.pro 63fd1bd947de2d3abe6a011685e6173bf0a804e1
+++ packages/webkit/webkit/WebKit.pro c4db9377c267835f4ec934a4d53207e26c25b99c
@@ -1,9 +1,8 @@ SUBDIRS += \
TEMPLATE = subdirs
CONFIG += ordered
!gdk-port:CONFIG += qt-port
qt-port:SUBDIRS += WebKitQt/Plugins
SUBDIRS += \
- JavaScriptCore/pcre/dftables.pro \
WebCore \
JavaScriptCore/kjs/testkjs.pro
============================================================
--- packages/webkit/webkit_svn.bb a579828b28b3be2c2c2b36f20643de557f0778dc
+++ packages/webkit/webkit_svn.bb 124f784a2e32f48ff79dc926a9bb0db2d47fcf66
@@ -1,4 +1,4 @@
-DEPENDS = "flex-native gperf-native gperf perl-native curl icu uicmoc4-native qmake2-native libxml2 sqlite3 cairo libxslt libidn gnutls gtk+"
+DEPENDS = "libpcre flex-native gperf-native gperf perl-native curl icu uicmoc4-native qmake2-native libxml2 sqlite3 cairo libxslt libidn gnutls gtk+"
# Yes, this is wrong...
PV = "0.0+svn${SRCDATE}"
@@ -31,7 +31,9 @@ do_compile_prepend() {
}
do_compile_prepend() {
- cd ${S}/WebKitBuilds/Debug
+ mkdir -p ${S}/WebKitBuilds/Debug/JavaScriptCore/pcre/tmp/
+ cp ${STAGING_BINDIR_NATIVE}/dftables ${S}/WebKitBuilds/Debug/JavaScriptCore/pcre/tmp/
+ cd ${S}/WebKitBuilds/Debug
}
do_install() {
More information about the Openembedded-commits
mailing list