kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

install extra libraries

Browse source 
* ext/extmk.rb (extract_makefile, extmake, configuration): store
  extra libraries to be installed.
* tool/rbinstall.rb (ext-arch): install extra libraries.
* ext/zlib/extconf.rb: install zlib if built.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@56230 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2016-09-24 13:26:21 +00:00
parent 3778f2f3d5
commit 97a016ac8a
4 changed files with 48 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

28
ext/zlib/extconf.rb
View file

@ -21,11 +21,27 @@ else
zsrc = dirs.max_by {|x| x.scan(/\d+/).map(&:to_i)}
end
if zsrc
addconf = [
"ZSRC = $(srcdir)/#{File.basename(zsrc)}\n",
"all:\n",
]
$INCFLAGS << " -I$(ZSRC)"
if $mswin or $mingw
$libs = append_library($libs, "zdll")
dll = "zlib1.dll"
$extso << dll
addconf.push(
"ZIMPLIB = zdll.lib\n",
"$(TARGET_SO): $(ZIMPLIB)\n",
"$(ZIMPLIB):\n",
"\t$(MAKE) -f $(ZSRC)/win32/Makefile.#{$nmake ? 'msc' : 'gcc'} TOP=$(ZSRC) $@\n",
"install-so: $(topdir)/#{dll}",
"$(topdir)/#{dll}: $(ZIMPLIB)\n",
"\t$(Q) $(COPY) #{dll} $(@D)\n",
)
end
Logging.message "using zlib in #{zsrc}\n"
$defs << "-DHAVE_ZLIB_H"
have_zlib = true
end
end
@ -82,17 +98,7 @@ if have_zlib
create_makefile('zlib') {|conf|
if zsrc
conf << "ZSRC = $(srcdir)/#{File.basename(zsrc)}\n"
conf << "all:\n"
if $mingw or $mswin
conf << "ZIMPLIB = zdll.lib\n"
conf << "$(TARGET_SO): $(ZIMPLIB)\n"
conf << "$(ZIMPLIB):\n"
conf << "\t$(MAKE) -f $(ZSRC)/win32/Makefile.#{$nmake ? 'msc' : 'gcc'} TOP=$(ZSRC) $@\n"
conf << "install-so: $(topdir)/#{dll}"
conf << "$(topdir)/#{dll}: $(ZIMPLIB)\n"
conf << "\t$(Q) $(COPY) #{dll} $(@D)\n"
end
conf.concat addconf if addconf
end
conf
}