Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

dep: update zlib to v1.2.13 (backport to v1.13.x) #2671

Merged
merged 2 commits into from
Oct 18, 2022
Merged

dep: update zlib to v1.2.13 (backport to v1.13.x) #2671

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
76dbc8c
dep: update zlib to v1.2.13
flavorjones Oct 18, 2022
212e07d
ext: hack to cross-compile zlib v1.2.13 on darwin
flavorjones Oct 18, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions dependencies.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ libxslt:
# sha-256 hash provided in https://download.gnome.org/sources/libxslt/1.1/libxslt-1.1.37.sha256sum

zlib:
version: "1.2.12"
sha256: "91844808532e5ce316b3c010929493c0244f3d37593afd6de04f71821d5136d9"
version: "1.2.13"
sha256: "b3a24de97a8fdbc835b9833169501030b8977031bcb54b3b3ac13740f846ab30"
# SHA-256 hash provided on http://zlib.net/

libiconv:
Expand Down
14 changes: 11 additions & 3 deletions ext/nokogiri/extconf.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -712,9 +712,17 @@ def install
else
class << recipe
def configure
cflags = concat_flags(ENV["CFLAGS"], "-fPIC", "-g")
execute("configure",
["env", "CHOST=#{host}", "CFLAGS=#{cflags}", "./configure", "--static", configure_prefix])
env = {}
env["CFLAGS"] = concat_flags(ENV["CFLAGS"], "-fPIC", "-g")
env["CHOST"] = host
execute("configure", ["./configure", "--static", configure_prefix], { env: env })
if darwin?
# needed as of zlib 1.2.13
Dir.chdir(work_path) do
makefile = File.read("Makefile").gsub(/^AR=.*$/, "AR=#{host}-libtool")
File.open("Makefile", "w") { |m| m.write(makefile) }
end
end
end
end
end
Expand Down