[oe-commits] org.oe.dev ruby: unified, fixed build

[hrw commit]

ruby: unified, fixed build

Author: hrw at openembedded.org
Branch: org.openembedded.dev
Revision: b7543cd2dc462a6eac2d07da5b8a046d889abacb
ViewMTN: http://monotone.openembedded.org/revision.psp?id=b7543cd2dc462a6eac2d07da5b8a046d889abacb
Files:
1
packages/ruby/ruby.inc
packages/ruby/ruby-native_1.8.5.bb
packages/ruby/ruby_1.8.5.bb
Diffs:

#
# mt diff -r49e38996bda7c1309e587226a9c3d152d0bb62e2 -rb7543cd2dc462a6eac2d07da5b8a046d889abacb
#
# 
# 
# add_file "packages/ruby/ruby.inc"
#  content [a6cf9226610267c6a2b087f4686f77b4366e3907]
# 
# patch "packages/ruby/ruby-native_1.8.5.bb"
#  from [016347f322a288be0fa624095da92027350eabe9]
#    to [046952df755a2c44e01e3f7dd1916dc0c00642cf]
# 
# patch "packages/ruby/ruby_1.8.5.bb"
#  from [5acc2b680325662e9db94f132aa71c0f8bc6597c]
#    to [abb57d427cbbc11f4ff83d8dc8f53951a1066f8b]
# 
============================================================
--- packages/ruby/ruby.inc	a6cf9226610267c6a2b087f4686f77b4366e3907
+++ packages/ruby/ruby.inc	a6cf9226610267c6a2b087f4686f77b4366e3907
@@ -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/
+}
============================================================
--- packages/ruby/ruby-native_1.8.5.bb	016347f322a288be0fa624095da92027350eabe9
+++ packages/ruby/ruby-native_1.8.5.bb	046952df755a2c44e01e3f7dd1916dc0c00642cf
@@ -1,3 +1,2 @@
-include ruby_${PV}.bb
+require ruby.inc
 inherit native
-DEPENDS = ""
============================================================
--- packages/ruby/ruby_1.8.5.bb	5acc2b680325662e9db94f132aa71c0f8bc6597c
+++ packages/ruby/ruby_1.8.5.bb	abb57d427cbbc11f4ff83d8dc8f53951a1066f8b
@@ -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
-}