ruby: openssl requires digest
authorLuiz Angelo Daros de Luca <luizluca@gmail.com>
Thu, 19 Dec 2019 05:09:39 +0000 (02:09 -0300)
committerLuiz Angelo Daros de Luca <luizluca@gmail.com>
Thu, 19 Dec 2019 05:09:39 +0000 (02:09 -0300)
Signed-off-by: Luiz Angelo Daros de Luca <luizluca@gmail.com>
lang/ruby/Makefile
lang/ruby/ruby_find_pkgsdeps

index 7b976341d2a3da0ac744cb396c09f99f8ae730a7..90c046a839a03961ba862a82fc56453acbc4f573 100644 (file)
@@ -12,7 +12,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ruby
 PKG_VERSION:=2.6.5
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 # First two numbes
 PKG_ABI_VERSION:=$(subst $(space),.,$(wordlist 1, 2, $(subst .,$(space),$(PKG_VERSION))))
@@ -817,7 +817,7 @@ $(eval $(call RubyBuildPackage,cmath,Trigonometric and transcendental functions
 $(eval $(call RubyBuildPackage,csv,CSV Reading and Writing,+ruby-date +ruby-forwardable +ruby-misc +ruby-stringio +ruby-strscan))
 $(eval $(call RubyBuildPackage,date,Comparable module for handling dates,))
 $(eval $(call RubyBuildPackage,dbm,Wrapper for the UNIX-style Database Manager Library,+libdb47))
-$(eval $(call RubyBuildPackage,debuglib,debug library,+ruby-misc +ruby-prettyprint +ruby-tracer))
+$(eval $(call RubyBuildPackage,debuglib,debug library,+ruby-filelib +ruby-prettyprint +ruby-tracer))
 $(eval $(call RubyBuildPackage,did-you-mean,did you mean? experience,+ruby-misc))
 $(eval $(call RubyBuildPackage,digest,Digest Library,+RUBY_DIGEST_USE_OPENSSL:libopenssl))
 $(eval $(call RubyBuildPackage,drb,distributed object system,+ruby-filelib +ruby-ipaddr +ruby-patterns))
@@ -847,7 +847,7 @@ $(eval $(call RubyBuildPackage,mutex_m,extend objects to be handled like a Mutex
 $(eval $(call RubyBuildPackage,net,Network Protocols Library,+ruby-time +ruby-digest +ruby-filelib +ruby-socket +ruby-stringio +ruby-strscan +ruby-uri))
 $(eval $(call RubyBuildPackage,net-telnet,telnet client,+ruby-net))
 $(eval $(call RubyBuildPackage,nkf,Network Kanji Filter,+ruby-enc))
-$(eval $(call RubyBuildPackage,openssl,SSL TLS and general purpose cryptography,+ruby-enc +ruby-ipaddr +ruby-stringio +libopenssl))
+$(eval $(call RubyBuildPackage,openssl,SSL TLS and general purpose cryptography,+ruby-digest +ruby-enc +ruby-ipaddr +ruby-stringio +libopenssl))
 $(eval $(call RubyBuildPackage,ostruct,build custom data structures,))
 $(eval $(call RubyBuildPackage,optparse,command-line option analysis,+ruby-misc +ruby-time))
 $(eval $(call RubyBuildPackage,patterns,design patterns implementation,))
index 4e625ff656db04afbec700802e0e201f7ba7835a..a322c0d9cfc119bd443a129addfeee041eebc51b 100644 (file)
@@ -114,11 +114,13 @@ packages.each do
 end
 exit(1) if failed
 
-# Add deps from .so
+# From ruby source: grep -E 'rb_require' -R . | grep -E '\.c:.*rb_require.*'
+# Add dependencies of ruby files from ruby lib.so
 package_files.each do |(pkg,files)| files.each do |file|
        case file
-       when /\/nkf\.so$/
-               files_requires[file]= files_requires[file] + ["enc/encdb"]
+       when /\/nkf\.so$/    ; files_requires[file]=files_requires[file] + ["enc/encdb"]
+       when /\/objspace\.so$/; files_requires[file]=files_requires[file] + ["tempfile"]        # dump_output from ext/objspace/objspace_dump.c
+       when /\/openssl\.so$/; files_requires[file]=files_requires[file] + ["digest"]           # Init_ossl_digest from ext/openssl/ossl_digest.c
        end
 end; end