diff options
| author | Paul Sokolovsky <pmiscml@gmail.com> | 2007-01-07 01:10:57 +0000 |
|---|---|---|
| committer | Paul Sokolovsky <pmiscml@gmail.com> | 2007-01-07 01:10:57 +0000 |
| commit | 70b83560cd4f5e56871d23190f9e9e30f25d3f77 (patch) | |
| tree | 93848bc82d23b918227791dd98ebe8f55f8657aa /packages | |
| parent | 87a16c99c6b15d99852684f5595e64ae0aee7531 (diff) | |
| parent | e348b22baa3ec3a4b9f391c85bb3aa01c537c0f5 (diff) | |
merge of '51c1973fbf9e5ab6be2494a36c0cda5878a155f9'
and 'df828882e68329df26345b8776d2271a115ac55e'
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/keymaps/files/htcuniversal/.mtn2git_empty | 0 | ||||
| -rw-r--r-- | packages/keymaps/files/htcuniversal/keymap-2.6.map | 10 | ||||
| -rw-r--r-- | packages/keymaps/keymaps_1.0.bb | 5 | ||||
| -rw-r--r-- | packages/ruby/ruby_1.8.5.bb | 18 |
4 files changed, 29 insertions, 4 deletions
diff --git a/packages/keymaps/files/htcuniversal/.mtn2git_empty b/packages/keymaps/files/htcuniversal/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/keymaps/files/htcuniversal/.mtn2git_empty 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} ;; *) 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 +} |