diff options
| author | Luiz Angelo Daros de Luca <luizluca@gmail.com> | 2015-04-27 11:48:45 -0300 |
|---|---|---|
| committer | Luiz Angelo Daros de Luca <luizluca@gmail.com> | 2015-04-27 11:55:12 -0300 |
| commit | 05387981d5d79371679f9a777cd44bbfc6531c2c (patch) | |
| tree | 247553d8c1632365ff5dca2cbdc0efb079bb31c3 /lang/ruby/Makefile | |
| parent | f0d822675373e7a23abda92ad4100835c8192cd7 (diff) | |
ruby: fix build when libyaml is present
libyaml is an optional dep for ruby psych. When missing, it uses
a bundled version of yaml. However, when libyaml is present in
openwrt build, ruby-psych packaging failed with deps not declared.
Now libyaml is configured as a hard dep for ruby-psych.
Also, the tk module was disabled in order to avoid a possible similar
problem if tk+x11 is provided in openwrt build. It was currently not
build because of missing deps.
Other minor changes:
- win32* modules where disabled (avoid err msg, no compile changes)
- Some files where removed in 2.2.x (like gserver.rb). They were already
not packaged but generates a build warning message. Now removed from install.
Signed-off-by: Luiz Angelo Daros de Luca <luizluca@gmail.com>
Diffstat (limited to 'lang/ruby/Makefile')
| -rw-r--r-- | lang/ruby/Makefile | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lang/ruby/Makefile b/lang/ruby/Makefile index e9c1f3ae1..eb90e3563 100644 --- a/lang/ruby/Makefile +++ b/lang/ruby/Makefile @@ -11,7 +11,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=ruby PKG_VERSION:=2.2.2 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_LIBVER:=2.2 @@ -575,7 +575,7 @@ endef define Package/ruby-psych $(call Package/ruby/Default) TITLE+=YAML parser and emitter - DEPENDS:=ruby +ruby-bigdecimal +ruby-datetime +ruby-misc +ruby-enc + DEPENDS:=ruby +ruby-bigdecimal +ruby-datetime +ruby-misc +ruby-enc +libyaml endef define Package/ruby-psych/description @@ -803,6 +803,7 @@ HOST_CONFIGURE_ARGS += \ --disable-install-rdoc \ --disable-install-capi \ --with-static-linked-ext \ + --with-out-ext=tk,tk/tkutil,win32,win32ole,dbm,gdbm,readline \ # even not used, host build with restricted exts results in gems not being # compiling for target (probably some cross compiling problem like checking @@ -819,6 +820,7 @@ CONFIGURE_ARGS += \ --disable-install-capi \ --with-ruby-version=minor \ --with-iconv-dir=$(ICONV_PREFIX) \ + --with-out-ext=tk,tk/tkutil,win32,win32ole ifndef CONFIG_RUBY_DIGEST_USE_OPENSSL CONFIGURE_ARGS += \ @@ -880,7 +882,6 @@ define Package/ruby-datetime/install ( cd $(PKG_INSTALL_DIR); $(TAR) -cf - \ usr/lib/ruby/$(PKG_LIBVER)/time.rb \ usr/lib/ruby/$(PKG_LIBVER)/date.rb \ - usr/lib/ruby/$(PKG_LIBVER)/date/ \ usr/lib/ruby/$(PKG_LIBVER)/*/date_core.so \ ) | ( cd $(1); $(TAR) -xf - ) endef @@ -1258,7 +1259,6 @@ endef define Package/ruby-socket/install ( cd $(PKG_INSTALL_DIR); $(TAR) -cf - \ - usr/lib/ruby/$(PKG_LIBVER)/gserver.rb \ usr/lib/ruby/$(PKG_LIBVER)/ipaddr.rb \ usr/lib/ruby/$(PKG_LIBVER)/resolv-replace.rb \ usr/lib/ruby/$(PKG_LIBVER)/resolv.rb \ |