Skip to content

Commit 4f7090b

Browse files
committed
patch 8.0.0240: failure with one build on CI
Problem: The clang build on CI fails with one configuration. Solution: Redo a previous patch that was accidentally reverted.
1 parent 1e07633 commit 4f7090b

2 files changed

Lines changed: 6 additions & 2 deletions

File tree

.travis.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,10 @@ addons:
7575
- cscope
7676

7777
before_install:
78-
- pip install --user cpp-coveralls
79-
- pip install --user requests[security]
78+
- if [ "$COVERAGE" = "yes" ]; then pip install --user cpp-coveralls; fi
79+
# needed for https support for coveralls
80+
# building cffi only works with gcc, not with clang
81+
- if [ "$COVERAGE" = "yes" ]; then CC=gcc pip install --user pyopenssl ndg-httpsclient pyasn1; fi
8082
# Lua is not installed on Travis OSX
8183
- if [ "$TRAVIS_OS_NAME" = "osx" ]; then brew install lua; export LUA_PREFIX=/usr/local; fi
8284

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -764,6 +764,8 @@ static char *(features[]) =
764764

765765
static int included_patches[] =
766766
{ /* Add new patch number below this line */
767+
/**/
768+
240,
767769
/**/
768770
239,
769771
/**/

0 commit comments

Comments
 (0)