From 7e873d9f0c70ca04dea117735b22dd174bbe1b01 Mon Sep 17 00:00:00 2001
From: Marcin Juszkiewicz <hrw@openembedded.org>
Date: Sun, 7 Jan 2007 00:48:14 +0000
Subject: ruby: build more extensions (zlib, curses, openssl) - close #1725,
 #1699

---
 packages/ruby/ruby_1.8.5.bb | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

(limited to 'packages')

diff --git a/packages/ruby/ruby_1.8.5.bb b/packages/ruby/ruby_1.8.5.bb
index 981f826dc6..972d56e14c 100644
--- a/packages/ruby/ruby_1.8.5.bb
+++ b/packages/ruby/ruby_1.8.5.bb
@@ -1,11 +1,25 @@
 DESCRIPTION = "Ruby is an interpreted scripting language \
 for quick and easy object-oriented programming."
 SECTION = "devel/ruby"
-DEPENDS = "ruby-native"
+DEPENDS = "ruby-native zlib openssl"
 PRIORITY = "optional"
 LICENSE = "GPL"
 
-SRC_URI = "ftp://ftp.ruby-lang.org/pub/ruby/ruby-${PV}.tar.gz"
+SRC_URI = "ftp://ftp.ruby-lang.org/pub/ruby/ruby-${PV}.tar.gz \
+           file://extmk_run.patch;patch=1 \
+           file://disable_wide_getaddrinfo_check.patch;patch=1"
+
 S = "${WORKDIR}/ruby-${PV}"
 
 inherit autotools
+
+# This snippet lets compiled extensions which rely on external libraries,
+# such as zlib, compile properly.  If we don't do this, then when extmk.rb
+# runs, it uses the native libraries instead of the target libraries, and so
+# none of the linking operations succeed -- which makes extconf.rb think
+# that the libraries aren't available and hence that the extension can't be
+# built.
+
+do_configure_prepend() {
+	sed -i "s#%%TARGET_CFLAGS%%#$TARGET_CFLAGS#; s#%%TARGET_LDFLAGS%%#$TARGET_LDFLAGS#" ${S}/common.mk
+}
-- 
cgit v1.2.3


From e348b22baa3ec3a4b9f391c85bb3aa01c537c0f5 Mon Sep 17 00:00:00 2001
From: GoxboxLive <goxboxlive@gmail.com>
Date: Sun, 7 Jan 2007 00:53:56 +0000
Subject: keymaps: added HTC Universal keymap - close #1731

---
 packages/keymaps/files/htcuniversal/.mtn2git_empty |  0
 packages/keymaps/files/htcuniversal/keymap-2.6.map | 10 ++++++++++
 packages/keymaps/keymaps_1.0.bb                    |  5 +++--
 3 files changed, 13 insertions(+), 2 deletions(-)
 create mode 100644 packages/keymaps/files/htcuniversal/.mtn2git_empty
 create mode 100644 packages/keymaps/files/htcuniversal/keymap-2.6.map

(limited to 'packages')

diff --git a/packages/keymaps/files/htcuniversal/.mtn2git_empty b/packages/keymaps/files/htcuniversal/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/packages/keymaps/files/htcuniversal/keymap-2.6.map b/packages/keymaps/files/htcuniversal/keymap-2.6.map
new file mode 100644
index 0000000000..91ca66e0a1
--- /dev/null
+++ b/packages/keymaps/files/htcuniversal/keymap-2.6.map
@@ -0,0 +1,10 @@
+#altgr keycode 18 = euro
+altgr keycode 15 = tilde
+altgr keycode 24 = slash
+altgr keycode 25 = backslash
+altgr keycode 32 = pound
+altgr keycode 37 = quotedbl
+altgr keycode 38 = apostrophe
+altgr keycode 50 = question
+altgr keycode 51 = semicolon
+altgr keycode 52 = colon
diff --git a/packages/keymaps/keymaps_1.0.bb b/packages/keymaps/keymaps_1.0.bb
index 2766fad2f4..a441292472 100644
--- a/packages/keymaps/keymaps_1.0.bb
+++ b/packages/keymaps/keymaps_1.0.bb
@@ -3,7 +3,7 @@ SECTION = "base"
 RDEPENDS = "initscripts console-tools"
 LICENSE = "GPL"
 PACKAGE_ARCH = "${MACHINE}"
-PR = "r11"
+PR = "r12"
 
 inherit update-rc.d
 
@@ -17,6 +17,7 @@ SRC_URI_append_collie       = " file://keymap-*.map"
 SRC_URI_append_poodle       = " file://keymap-*.map"
 SRC_URI_append_jornada6xx   = " file://keymap-*.map"
 SRC_URI_append_h2200        = " file://keymap-*.map"
+SRC_URI_append_htcuniversal = " file://keymap-*.map"
 
 INITSCRIPT_NAME = "keymap"
 INITSCRIPT_PARAMS = "start 00 S ."
@@ -26,7 +27,7 @@ do_install () {
     install -m 0755 ${WORKDIR}/keymap ${D}${sysconfdir}/init.d/
 
     case ${MACHINE} in
-        c7x0 | tosa | spitz | akita | borzoi | collie | poodle | jornada6xx | h2200)
+        c7x0 | tosa | spitz | akita | borzoi | collie | poodle | jornada6xx | h2200 | htuniversal )
             install -m 0644 ${WORKDIR}/keymap-*.map	${D}${sysconfdir}
             ;;
         *)
-- 
cgit v1.2.3