zlib 1.0.0 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: e2d28dc0bcac8345db3a2f65229fc3ac5d3130e7
-  data.tar.gz: 23ac52950f8d7417ad3505300fb706a908eeda97
+SHA256:
+  metadata.gz: 38b96853c00eb5d1b6b2ad47512fc97d4f4c589e77106dd6cc7f501a3de7ce0c
+  data.tar.gz: 8fc6e8d0207cc631d85a2cb248502263faf6b2184fab4de0c762d360c95b482f
 SHA512:
-  metadata.gz: fb489611bdaf16c1c20804d28fae2c3f28c0a9a5a9cecc54996cad555653d447a74060ed087b0edfe186fc8de06de65d61b93fe657f8ed8c5364329606061193
-  data.tar.gz: 10f5154d4e3f5f085b2aa32cb4d933842fc528892ed671031e9b35e818f0af9d427b0187de43d44c1b59873fef8dc4c8441ca431f3de78c0e25f6a2aa80503d0
+  metadata.gz: 3b9a862a80f4b7146e5d918b917990349ed3be78c8636346636f787b6955c764406717330d1206ec8ea9347149ebe544d03e571c8e9754840f1fd6ac38b794df
+  data.tar.gz: ca43a10903aa4c981f8de059fd12c695ec4a31b2e8c5ccf34161f828f059660108d7406851c416f90eca9d54f07332cab606c305f566b5b0dac805a94b57e573

data/README.md

@@ -1,8 +1,6 @@
 # Zlib
 
-[![Build Status](https://travis-ci.org/ruby/zlib.svg?branch=master)](https://travis-ci.org/ruby/zlib)
-
-This module provides access to the {zlib library}[http://zlib.net]. Zlib is designed to be a portable, free, general-purpose, legally unencumbered -- that is, not covered by any patents -- lossless data-compression library for use on virtually any computer hardware and operating system.
+This module provides access to the [zlib library](http://zlib.net). Zlib is designed to be a portable, free, general-purpose, legally unencumbered -- that is, not covered by any patents -- lossless data-compression library for use on virtually any computer hardware and operating system.
 
 The zlib compression library provides in-memory compression and decompression functions, including integrity checks of the uncompressed data.
 
@@ -34,7 +32,7 @@ Or install it yourself as:
 
 Using the wrapper to compress strings with default parameters is quite simple:
 
-```
+```ruby
 require "zlib"
 
 data_to_compress = File.read("don_quixote.txt")

data/ext/zlib/extconf.rb

@@ -10,11 +10,12 @@ require 'rbconfig'
 
 dir_config 'zlib'
 
-
+libs = $libs
 if %w'z libz zlib1 zlib zdll zlibwapi'.find {|z| have_library(z, 'deflateReset')} and
     have_header('zlib.h') then
   have_zlib = true
 else
+  $libs = libs
   unless File.directory?(zsrc = "#{$srcdir}/zlib")
     dirs = Dir.open($srcdir) {|z| z.grep(/\Azlib-\d+[.\d]*\z/) {|x|"#{$srcdir}/#{x}"}}
     dirs.delete_if {|x| !File.directory?(x)}
@@ -31,9 +32,12 @@ else
       $extso << dll
       $cleanfiles << "$(topdir)/#{dll}" << "$(ZIMPLIB)"
       zmk = "\t$(MAKE) -f $(ZMKFILE) TOP=$(ZSRC)"
+      zopts = []
       if $nmake
         zmkfile = "$(ZSRC)/win32/Makefile.msc"
         m = "#{zsrc}/win32/Makefile.msc"
+        # zopts << "USE_ASM=1"
+        zopts << "ARCH=#{RbConfig::CONFIG['target_cpu']}"
       else
         zmkfile = "$(ZSRC)/win32/Makefile.gcc"
         m = "#{zsrc}/win32/Makefile.gcc"
@@ -43,7 +47,7 @@ else
       end
       m = File.read(m)
       zimplib = m[/^IMPLIB[ \t]*=[ \t]*(\S+)/, 1]
-      $LOCAL_LIBS << " " << zimplib
+      ($LOCAL_LIBS << " ./" << zimplib).strip!
       unless $nmake or /^TOP[ \t]/ =~ m
         m.gsub!(/win32\/zlib\.def/, '$(TOP)/\&')
         m.gsub!(/^(\t.*[ \t])(\S+\.rc)/, '\1-I$(<D) $<')
@@ -55,10 +59,11 @@ else
       addconf.push(
         "ZMKFILE = #{zmkfile}\n",
         "ZIMPLIB = #{zimplib}\n",
+        "ZOPTS = #{zopts.join(' ')}\n",
         "$(TARGET_SO): $(ZIMPLIB)\n",
         "$(ZIMPLIB):\n",
-        "#{zmk} $@\n",
-        "install-so: $(topdir)/#{dll}",
+        "#{zmk} $(ZOPTS) $@\n",
+        "install-so static: $(topdir)/#{dll}",
         "$(topdir)/#{dll}: $(ZIMPLIB)\n",
         "\t$(Q) $(COPY) #{dll} $(@D)\n",
         "clean: clean-zsrc\n",