diff options
| author | Michaël Burtin <mburtin@connected-labs.com> | 2014-04-29 12:06:22 +0200 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2014-05-03 20:47:02 +0200 |
| commit | f3b2dbf15d37f52f289b6ff2ed43a98872209607 (patch) | |
| tree | 9050ca20bb415f7e180961fd76e62647f7168133 /meta-ruby | |
| parent | 0ffd1ba9abbc30f12a5053710a13c88e27a957f4 (diff) | |
| download | meta-openembedded-f3b2dbf15d37f52f289b6ff2ed43a98872209607.tar.gz | |
ruby: remove obsolete extmk_run.patch
This patch does nothing except causing failures from the second build in
the same working directory.
Signed-off-by: Michaël Burtin <mburtin@connected-labs.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-ruby')
| -rw-r--r-- | meta-ruby/recipes-devtools/ruby/ruby.inc | 1 | ||||
| -rw-r--r-- | meta-ruby/recipes-devtools/ruby/ruby/extmk_run.patch | 15 |
2 files changed, 0 insertions, 16 deletions
diff --git a/meta-ruby/recipes-devtools/ruby/ruby.inc b/meta-ruby/recipes-devtools/ruby/ruby.inc index 837e52b3a0..e679f27a21 100644 --- a/meta-ruby/recipes-devtools/ruby/ruby.inc +++ b/meta-ruby/recipes-devtools/ruby/ruby.inc | |||
| @@ -21,7 +21,6 @@ INC_PR = "r1" | |||
| 21 | 21 | ||
| 22 | SHRT_VER = "${@bb.data.getVar('PV',d,1).split('.')[0]}.${@bb.data.getVar('PV',d,1).split('.')[1]}" | 22 | SHRT_VER = "${@bb.data.getVar('PV',d,1).split('.')[0]}.${@bb.data.getVar('PV',d,1).split('.')[1]}" |
| 23 | SRC_URI = "http://ftp.ruby-lang.org/pub/ruby/${SHRT_VER}/ruby-${PV}.tar.gz \ | 23 | SRC_URI = "http://ftp.ruby-lang.org/pub/ruby/${SHRT_VER}/ruby-${PV}.tar.gz \ |
| 24 | file://extmk_run.patch \ | ||
| 25 | file://extmk.patch \ | 24 | file://extmk.patch \ |
| 26 | " | 25 | " |
| 27 | 26 | ||
diff --git a/meta-ruby/recipes-devtools/ruby/ruby/extmk_run.patch b/meta-ruby/recipes-devtools/ruby/ruby/extmk_run.patch deleted file mode 100644 index 57926f51b0..0000000000 --- a/meta-ruby/recipes-devtools/ruby/ruby/extmk_run.patch +++ /dev/null | |||
| @@ -1,15 +0,0 @@ | |||
| 1 | ============================================================ | ||
| 2 | --- packages/ruby/ruby-1.8.5/extmk_run.patch d9738b5a71e2f9a98d009af9fd0ef1ceaff9ef48 | ||
| 3 | +++ packages/ruby/ruby-1.8.5/extmk_run.patch d9738b5a71e2f9a98d009af9fd0ef1ceaff9ef48 | ||
| 4 | @@ -0,0 +1,11 @@ | ||
| 5 | +--- ruby-1.8.5/common.mk.orig 2006-12-30 13:07:32.000000000 +1100 | ||
| 6 | ++++ ruby-1.8.5/common.mk 2006-12-30 13:08:32.000000000 +1100 | ||
| 7 | +@@ -56,7 +56,7 @@ | ||
| 8 | + --make="$(MAKE)" \ | ||
| 9 | + --mflags="$(MFLAGS)" \ | ||
| 10 | + --make-flags="$(MAKEFLAGS)" | ||
| 11 | +-EXTMK_ARGS = $(SCRIPT_ARGS) --extout="$(EXTOUT)" --extension $(EXTS) --extstatic $(EXTSTATIC) -- | ||
| 12 | ++EXTMK_ARGS = $(SCRIPT_ARGS) --with-ldflags="%%TARGET_LDFLAGS%%" --with-cflags="%%TARGET_CFLAGS%%" --extout="$(EXTOUT)" --extension $(EXTS) --extstatic $(EXTSTATIC) -- | ||
| 13 | + | ||
| 14 | + all: $(MKFILES) $(PREP) $(RBCONFIG) $(LIBRUBY) | ||
| 15 | + @$(MINIRUBY) $(srcdir)/ext/extmk.rb $(EXTMK_ARGS) | ||
