[oe-commits] Angus Ainslie : ruby: Fixed ruby 1.8.5 compilation problem

[GIT User account]

Module: openembedded.git
Branch: fso/milestone5.5
Commit: c8db486b150008619dfeb3259728c816af812675
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=c8db486b150008619dfeb3259728c816af812675

Author: Angus Ainslie <nytowl at openmoko.org>
Date:   Fri Apr 10 23:18:03 2009 -0600

ruby: Fixed ruby 1.8.5 compilation problem

Backported openssl fix from 1.8.7 for successfull ruby 1.8.5
compilation.

Signed-off-by: Ihar Hrachyshka <ihar.hrachyshka at gmail.com>

---

 packages/tasks/task-openmoko-feed.bb |   19 ++++++++++---------
 1 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/packages/tasks/task-openmoko-feed.bb b/packages/tasks/task-openmoko-feed.bb
index 4c0430b..d92b7e9 100644
--- a/packages/tasks/task-openmoko-feed.bb
+++ b/packages/tasks/task-openmoko-feed.bb
@@ -57,6 +57,8 @@ RDEPENDS_task-openmoko-feed = "\
   asterisk \
 #  gnash \
 #  mono \
+# don't include om-locations right now because it includes diversity-dameon which is broken
+#  om-locations \
 #  diversity-daemon \
   om-maps-berlin \
   om-maps-buenos-aires \
@@ -69,7 +71,6 @@ RDEPENDS_task-openmoko-feed = "\
   om-maps-san-francisco \
   om-maps-sydney \
   om-maps-taipei \
-  om-locations \
   om-settings \
   assassin \
   assassin-thumbnail \
@@ -135,29 +136,29 @@ RDEPENDS_task-openmoko-feed = "\
   font-adobe-75dpi \
   font-adobe-utopia-100dpi \
   font-adobe-utopia-75dpi \
-  font-adobe-utopia-type1 \
+#  font-adobe-utopia-type1 \
   font-arabic-misc \
   font-bh-100dpi \
   font-bh-75dpi \
   font-bh-lucidatypewriter-100dpi \
   font-bh-lucidatypewriter-75dpi \
-  font-bh-ttf \
-  font-bh-type1 \
+#  font-bh-ttf \
+#  font-bh-type1 \
   font-bitstream-100dpi \
   font-bitstream-75dpi \
   font-bitstream-speedo \
-  font-bitstream-type1 \
+#  font-bitstream-type1 \
   font-cronyx-cyrillic \
   font-cursor-misc \
   font-daewoo-misc \
   font-dec-misc \
-  font-ibm-type1 \
+#  font-ibm-type1 \
   font-isas-misc \
   font-jis-misc \
   font-micro-misc \
   font-misc-cyrillic \
-  font-misc-ethiopic \
-  font-misc-meltho \
+#  font-misc-ethiopic \
+#  font-misc-meltho \
   font-misc-misc \
   font-mutt-misc \
   font-schumacher-misc \
@@ -165,5 +166,5 @@ RDEPENDS_task-openmoko-feed = "\
   font-sony-misc \
   font-sun-misc \
   font-winitzki-cyrillic \
-  font-xfree86-type1 \
+#  font-xfree86-type1 \
 "