Skip to content

Use bundled zlib #84

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

Merged
ethomson merged 2 commits into from
Nov 29, 2018
Merged

Use bundled zlib #84

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
17eeaac
Remove zlib from Dockerfiles
bording Nov 29, 2018
1772c50
Use bundled zlib
bording Nov 29, 2018
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
2 changes: 1 addition & 1 deletion Dockerfile.debian.9-x64
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@ FROM debian:9
WORKDIR /nativebinaries
COPY . /nativebinaries/

RUN apt update && apt -y install cmake gcc libssl-dev pkg-config zlib1g-dev
RUN apt update && apt -y install cmake gcc libssl-dev pkg-config

CMD ["/bin/bash", "-c", "./build.libgit2.sh"]
2 changes: 1 addition & 1 deletion Dockerfile.ubuntu.18.04-x64
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@ FROM ubuntu:18.04
WORKDIR /nativebinaries
COPY . /nativebinaries/

RUN apt update && apt -y install cmake libssl-dev pkg-config zlib1g-dev
RUN apt update && apt -y install cmake libssl-dev pkg-config

CMD ["/bin/bash", "-c", "./build.libgit2.sh"]
1 change: 1 addition & 0 deletions build.libgit2.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ cmake -DCMAKE_BUILD_TYPE:STRING=Release \
-DENABLE_TRACE=ON \
-DLIBGIT2_FILENAME=git2-$SHORTSHA \
-DCMAKE_OSX_ARCHITECTURES="i386;x86_64" \
-DUSE_BUNDLED_ZLIB=ON \
..
cmake --build .

Expand Down