From f697f7c335492fa456ad6d6da2d44739e85ead42 Mon Sep 17 00:00:00 2001 From: Dmitry Eremin-Solenikov Date: Mon, 5 Sep 2011 02:52:26 +0400 Subject: opie-taskbar: fix linking issues for 1.2.5 version Link to libcrypt, libm & libopiepim2 explicitly. Signed-off-by: Dmitry Eremin-Solenikov Signed-off-by: Paul Eggleton --- .../opie-taskbar/fix-crypt-reference.patch | 21 +++++++++++++++++++++ recipes-opie/opie-taskbar/opie-taskbar_1.2.5.bb | 3 ++- 2 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 recipes-opie/opie-taskbar/opie-taskbar/fix-crypt-reference.patch diff --git a/recipes-opie/opie-taskbar/opie-taskbar/fix-crypt-reference.patch b/recipes-opie/opie-taskbar/opie-taskbar/fix-crypt-reference.patch new file mode 100644 index 0000000..c086027 --- /dev/null +++ b/recipes-opie/opie-taskbar/opie-taskbar/fix-crypt-reference.patch @@ -0,0 +1,21 @@ +Index: launcher/server.pro +=================================================================== +--- launcher.orig/server.pro 2011-09-05 01:45:20.000000000 +0400 ++++ launcher/server.pro 2011-09-05 01:46:39.000000000 +0400 +@@ -80,14 +80,12 @@ + INCLUDEPATH += mediummount + DEPENDPATH += mediummount + +-LIBS = -lqpe -lopiecore2 -lopieui2 -lopiesecurity2 -lqrsync -lsysfs ++LIBS = -lqpe -lopiecore2 -lopieui2 -lopiesecurity2 -lopiepim2 -lqrsync -lsysfs + TARGET = qpe + + ## not ready for use yet + # DEFINES += QPE_HAVE_DIRECT_ACCESS + +-contains( $(CONFIG_TARGET_MACOSX), y ) { +- LIBS += -lcrypt +-} ++LIBS += -lcrypt -lm + + include( //home/users/mitya/OE/setup-scripts/build/tmp-angstrom_2010_x-eglibc/sysroots/tosa/usr/lib/opie/include.pro ) diff --git a/recipes-opie/opie-taskbar/opie-taskbar_1.2.5.bb b/recipes-opie/opie-taskbar/opie-taskbar_1.2.5.bb index e71926f..89fe296 100644 --- a/recipes-opie/opie-taskbar/opie-taskbar_1.2.5.bb +++ b/recipes-opie/opie-taskbar/opie-taskbar_1.2.5.bb @@ -1,5 +1,5 @@ require ${PN}.inc -PR = "r1" +PR = "r2" SRC_URI = "http://sources.openembedded.org/opie-1.2.5-split_core_apps_calibrate.tar.bz2;name=split_core_apps_calibrate \ http://sources.openembedded.org/opie-1.2.5-split_noncore_settings_mediummount.tar.bz2;name=split_noncore_settings_mediummount \ @@ -15,6 +15,7 @@ SRC_URI = "http://sources.openembedded.org/opie-1.2.5-split_core_apps_calibrate. file://server-pro-125.patch \ file://firstuse-path.patch \ file://force-firstuse-calibrate.patch \ + file://fix-crypt-reference.patch \ " SRC_URI[split_core_apps_calibrate.md5sum] = "ee5e06b781e92f01271d883f91f101b0" SRC_URI[split_core_apps_calibrate.sha256sum] = "5e0164a195a166fd15451164edf8a44d8f3a9f81dcf3edc3a8975f24bd4b45b6" -- cgit 1.2.3-korg