Browse Source

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>
Luiz Angelo Daros de Luca 10 years ago
parent
commit
05387981d5
1 changed files with 4 additions and 4 deletions
  1. 4
    4
      lang/ruby/Makefile

+ 4
- 4
lang/ruby/Makefile View File

11
 
11
 
12
 PKG_NAME:=ruby
12
 PKG_NAME:=ruby
13
 PKG_VERSION:=2.2.2
13
 PKG_VERSION:=2.2.2
14
-PKG_RELEASE:=1
14
+PKG_RELEASE:=2
15
 
15
 
16
 PKG_LIBVER:=2.2
16
 PKG_LIBVER:=2.2
17
 
17
 
575
 define Package/ruby-psych
575
 define Package/ruby-psych
576
 $(call Package/ruby/Default)
576
 $(call Package/ruby/Default)
577
   TITLE+=YAML parser and emitter
577
   TITLE+=YAML parser and emitter
578
-  DEPENDS:=ruby +ruby-bigdecimal +ruby-datetime +ruby-misc +ruby-enc
578
+  DEPENDS:=ruby +ruby-bigdecimal +ruby-datetime +ruby-misc +ruby-enc +libyaml
579
 endef
579
 endef
580
 
580
 
581
 define Package/ruby-psych/description
581
 define Package/ruby-psych/description
803
 	--disable-install-rdoc \
803
 	--disable-install-rdoc \
804
 	--disable-install-capi \
804
 	--disable-install-capi \
805
 	--with-static-linked-ext \
805
 	--with-static-linked-ext \
806
+	--with-out-ext=tk,tk/tkutil,win32,win32ole,dbm,gdbm,readline \
806
 
807
 
807
 # even not used, host build with restricted exts results in gems not being
808
 # even not used, host build with restricted exts results in gems not being
808
 # compiling for target (probably some cross compiling problem like checking
809
 # compiling for target (probably some cross compiling problem like checking
819
 	--disable-install-capi \
820
 	--disable-install-capi \
820
 	--with-ruby-version=minor \
821
 	--with-ruby-version=minor \
821
 	--with-iconv-dir=$(ICONV_PREFIX) \
822
 	--with-iconv-dir=$(ICONV_PREFIX) \
823
+	--with-out-ext=tk,tk/tkutil,win32,win32ole
822
 
824
 
823
 ifndef CONFIG_RUBY_DIGEST_USE_OPENSSL
825
 ifndef CONFIG_RUBY_DIGEST_USE_OPENSSL
824
 CONFIGURE_ARGS += \
826
 CONFIGURE_ARGS += \
880
 	( cd $(PKG_INSTALL_DIR); $(TAR) -cf - \
882
 	( cd $(PKG_INSTALL_DIR); $(TAR) -cf - \
881
 		usr/lib/ruby/$(PKG_LIBVER)/time.rb \
883
 		usr/lib/ruby/$(PKG_LIBVER)/time.rb \
882
 		usr/lib/ruby/$(PKG_LIBVER)/date.rb \
884
 		usr/lib/ruby/$(PKG_LIBVER)/date.rb \
883
-		usr/lib/ruby/$(PKG_LIBVER)/date/ \
884
 		usr/lib/ruby/$(PKG_LIBVER)/*/date_core.so \
885
 		usr/lib/ruby/$(PKG_LIBVER)/*/date_core.so \
885
 	) | ( cd $(1); $(TAR) -xf - )
886
 	) | ( cd $(1); $(TAR) -xf - )
886
 endef
887
 endef
1258
 
1259
 
1259
 define Package/ruby-socket/install
1260
 define Package/ruby-socket/install
1260
 	( cd $(PKG_INSTALL_DIR); $(TAR) -cf - \
1261
 	( cd $(PKG_INSTALL_DIR); $(TAR) -cf - \
1261
-		usr/lib/ruby/$(PKG_LIBVER)/gserver.rb \
1262
 		usr/lib/ruby/$(PKG_LIBVER)/ipaddr.rb \
1262
 		usr/lib/ruby/$(PKG_LIBVER)/ipaddr.rb \
1263
 		usr/lib/ruby/$(PKG_LIBVER)/resolv-replace.rb \
1263
 		usr/lib/ruby/$(PKG_LIBVER)/resolv-replace.rb \
1264
 		usr/lib/ruby/$(PKG_LIBVER)/resolv.rb \
1264
 		usr/lib/ruby/$(PKG_LIBVER)/resolv.rb \