Skip to content

Commit 372c50e

Browse files
authored
Merge pull request #84 from libgit2/remove-zlib
Use bundled zlib
2 parents 8abdca3 + 1772c50 commit 372c50e

File tree

3 files changed

+3
-2
lines changed

3 files changed

+3
-2
lines changed

Dockerfile.debian.9-x64

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@ FROM debian:9
22
WORKDIR /nativebinaries
33
COPY . /nativebinaries/
44

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

77
CMD ["/bin/bash", "-c", "./build.libgit2.sh"]

Dockerfile.ubuntu.18.04-x64

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@ FROM ubuntu:18.04
22
WORKDIR /nativebinaries
33
COPY . /nativebinaries/
44

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

77
CMD ["/bin/bash", "-c", "./build.libgit2.sh"]

build.libgit2.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ cmake -DCMAKE_BUILD_TYPE:STRING=Release \
1515
-DENABLE_TRACE=ON \
1616
-DLIBGIT2_FILENAME=git2-$SHORTSHA \
1717
-DCMAKE_OSX_ARCHITECTURES="i386;x86_64" \
18+
-DUSE_BUNDLED_ZLIB=ON \
1819
..
1920
cmake --build .
2021

0 commit comments

Comments
 (0)