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

enable USE_LIBPCRE when building Git #105

Closed
wants to merge 3 commits into from
Closed

enable USE_LIBPCRE when building Git #105

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1c2f912
add hooks to ensure PCRE dependency is installed
shiftkey Jan 17, 2019
20e6fcc
update config
shiftkey Jan 17, 2019
71e3c11
enable for macOS and Linux AMD64 builds
shiftkey Jan 17, 2019
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
6 changes: 6 additions & 0 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,17 @@ matrix:
env:
- TARGET_PLATFORM=ubuntu
- GIT_LFS_CHECKSUM=c098092be413915793214a570cd51ef46089b6f6616b2f78e35ba374de613b5b
addons:
apt:
packages:
- libpcre3-dev
- os: osx
language: c
env:
- TARGET_PLATFORM=macOS
- GIT_LFS_CHECKSUM=84ac4953c55bbaf87efd1c3d5b7778b1cf0b257025d2a86d709a2bf301c32c8b
before_script:
- brew install pcre2
- os: linux
language: c
env:
Expand Down
5 changes: 3 additions & 2 deletions docker/arm64/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@ RUN apt-get install -y \
curl \
zlib1g-dev \
libssl-dev \
gettext
gettext \
libpcre3-dev

ENV CURL_INSTALL_DIR "/tmp/build/curl"
ENV CURL_VERSION "curl-7.61.1"
Expand All @@ -28,4 +29,4 @@ RUN make install
#cleanup
WORKDIR /tmp
RUN rm -rf "$CURL_VERSION.tar.gz"
RUN rm -rf "$CURL_VERSION"
RUN rm -rf "$CURL_VERSION"
1 change: 1 addition & 0 deletions script/build-macos.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ make clean
DESTDIR="$DESTINATION" make strip install prefix=/ \
NO_PERL=1 \
NO_TCLTK=1 \
USE_LIBPCRE=1 \
NO_GETTEXT=1 \
NO_DARWIN_PORTS=1 \
NO_INSTALL_HARDLINKS=1 \
Expand Down
3 changes: 2 additions & 1 deletion script/build-ubuntu.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ CC='gcc' \
DESTDIR="$DESTINATION" \
NO_TCLTK=1 \
NO_GETTEXT=1 \
USE_LIBPCRE1=1 \
NO_INSTALL_HARDLINKS=1 \
NO_R_TO_GCC_LINKER=1 \
make strip install
Expand Down Expand Up @@ -131,4 +132,4 @@ GIT_CURL_VERBOSE=1 \
GIT_EXEC_PATH="$DESTINATION/libexec/git-core" \
PREFIX="$DESTINATION" \
./git clone https://github.com/git/git.github.io "$TEMP_CLONE_DIR/git.github.io"
)
)
6 changes: 6 additions & 0 deletions script/generate-travis-config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ function getConfig(
os: 'osx',
language: 'c',
env: ['TARGET_PLATFORM=macOS', `GIT_LFS_CHECKSUM=${lfsFile.checksum}`],
before_script: ['brew install pcre2'],
}
}

Expand All @@ -85,6 +86,11 @@ function getConfig(
os: 'linux',
language: 'c',
env: ['TARGET_PLATFORM=ubuntu', `GIT_LFS_CHECKSUM=${lfsFile.checksum}`],
addons: {
apt: {
packages: ['libpcre3-dev'],
},
},
}
} else if (arch === 'arm64') {
return {
Expand Down