ruby: unified, fixed build

diff --git a/packages/ruby/ruby-native_1.8.5.bb b/packages/ruby/ruby-native_1.8.5.bb
index d5ccae8..e4d2a33 100644 (file)
--- a/packages/ruby/ruby-native_1.8.5.bb
+++ b/packages/ruby/ruby-native_1.8.5.bb
@@ -1,3 +1,2 @@
-include ruby_${PV}.bb
+require ruby.inc
 inherit native
-DEPENDS = ""

diff --git a/packages/ruby/ruby.inc b/packages/ruby/ruby.inc
new file mode 100644 (file)
index 0000000..9fe8333
--- /dev/null
+++ b/packages/ruby/ruby.inc
@@ -0,0 +1,25 @@
+DESCRIPTION = "Ruby is an interpreted scripting language \
+for quick and easy object-oriented programming."
+SECTION = "devel/ruby"
+PRIORITY = "optional"
+LICENSE = "GPL"
+
+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
+       rm -rf ${S}/ruby/
+}

diff --git a/packages/ruby/ruby_1.8.5.bb b/packages/ruby/ruby_1.8.5.bb
index 972d56e..d06e9e0 100644 (file)
--- a/packages/ruby/ruby_1.8.5.bb
+++ b/packages/ruby/ruby_1.8.5.bb
@@ -1,25 +1,2 @@
-DESCRIPTION = "Ruby is an interpreted scripting language \
-for quick and easy object-oriented programming."
-SECTION = "devel/ruby"
+require ruby.inc
 DEPENDS = "ruby-native zlib openssl"
-PRIORITY = "optional"
-LICENSE = "GPL"
-
-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
-}