diff options
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/geoclue/geoclue_git.bb | 7 | ||||
| -rw-r--r-- | packages/webkit/webkit/Makefile.shared | 9 | ||||
| -rw-r--r-- | packages/webkit/webkit/WebKit.pro | 1 |
3 files changed, 12 insertions, 5 deletions
diff --git a/packages/geoclue/geoclue_git.bb b/packages/geoclue/geoclue_git.bb index 376abdc326..515cfdab1c 100644 --- a/packages/geoclue/geoclue_git.bb +++ b/packages/geoclue/geoclue_git.bb @@ -1,7 +1,7 @@ DESCRIPTION = "GeoClue is a project that provide all kinds of geography information to an application" HOMEPAGE = "http://live.gnome.org/GeoClue" -DEPENDS = "gpsd libxml2 libsoup dbus-glib" +DEPENDS = "libgpsmgr libgpsbt gtk+ gpsd libxml2 gconf-dbus libsoup dbus-glib" PV = "0.0+git${SRCDATE}" PR = "r0" @@ -13,6 +13,11 @@ SRC_URI = "git://anongit.freedesktop.org/git/geoclue;protocol=git" S = "${WORKDIR}/git" + +LDFLAGS_append = " -lgthread-2.0 " + +EXTRA_OECONF = " --enable-applet=no " + do_install_append() { mkdir -p ${D}/usr/share/ cp -pPr ${D}${STAGING_DATADIR}/* ${D}/usr/share diff --git a/packages/webkit/webkit/Makefile.shared b/packages/webkit/webkit/Makefile.shared index df3389ca3b..a036aacc50 100644 --- a/packages/webkit/webkit/Makefile.shared +++ b/packages/webkit/webkit/Makefile.shared @@ -1,20 +1,21 @@ -XCODE_OPTIONS = `perl -I../WebKitTools/Scripts -Mwebkitdirs -e 'print XcodeOptionString()'` $(ARGS) +SCRIPTS_PATH ?= ../WebKitTools/Scripts +XCODE_OPTIONS = `perl -I$(SCRIPTS_PATH) -Mwebkitdirs -e 'print XcodeOptionString()'` $(ARGS) all: ( xcodebuild $(OTHER_OPTIONS) $(XCODE_OPTIONS) | grep -v setenv && exit $${PIPESTATUS[0]} ) debug d development dev develop: force - ../WebKitTools/Scripts/set-webkit-configuration --debug + $(SCRIPTS_PATH)/set-webkit-configuration --debug ( xcodebuild $(OTHER_OPTIONS) $(XCODE_OPTIONS) | grep -v setenv && exit $${PIPESTATUS[0]} ) release r deployment dep deploy: force - ../WebKitTools/Scripts/set-webkit-configuration --release + $(SCRIPTS_PATH)/set-webkit-configuration --release ( xcodebuild $(OTHER_OPTIONS) $(XCODE_OPTIONS) | grep -v setenv && exit $${PIPESTATUS[0]} ) universal u: force ( xcodebuild $(OTHER_OPTIONS) $(XCODE_OPTIONS) 'ARCHS=ppc i386' | grep -v setenv && exit $${PIPESTATUS[0]} ) clean: - ( xcodebuild -alltargets clean $(XCODE_OPTIONS) | grep -v setenv && exit $${PIPESTATUS[0]} ) + ( xcodebuild $(OTHER_OPTIONS) -alltargets clean $(XCODE_OPTIONS) | grep -v setenv && exit $${PIPESTATUS[0]} ) force: ; diff --git a/packages/webkit/webkit/WebKit.pro b/packages/webkit/webkit/WebKit.pro index 335d11e6e7..712eeadb78 100644 --- a/packages/webkit/webkit/WebKit.pro +++ b/packages/webkit/webkit/WebKit.pro @@ -3,6 +3,7 @@ CONFIG += ordered !gdk-port:CONFIG += qt-port qt-port:SUBDIRS += WebKitQt/Plugins SUBDIRS += \ + JavaScriptCore/pcre/dftables.pro \ WebCore \ JavaScriptCore/kjs/testkjs.pro |