From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 11 Nov 2016 21:56:30 +0000 (-0800)
Subject: Merge branch 'ls/macos-update'
X-Git-Tag: v2.11.0-rc1~4
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/332fd5655a1e162b2fe47009dfc77ca2a94908e7?hp=--cc

Merge branch 'ls/macos-update'

Portability update and workaround for builds on recent Mac OS X.

* ls/macos-update:
travis-ci: disable GIT_TEST_HTTPD for macOS
Makefile: set NO_OPENSSL on macOS by default
---

332fd5655a1e162b2fe47009dfc77ca2a94908e7
diff --cc .travis.yml
index 9a65514d82,684ecfdd36..0b2ea5c3e2
--- a/.travis.yml
+++ b/.travis.yml
@@@ -31,8 -31,7 +31,7 @@@ env
      - LINUX_GIT_LFS_VERSION="1.2.0"
      - DEFAULT_TEST_TARGET=prove
      - GIT_PROVE_OPTS="--timer --jobs 3 --state=failed,slow,save"
 -    - GIT_TEST_OPTS="--verbose --tee"
 +    - GIT_TEST_OPTS="--verbose-log"
-     - GIT_TEST_HTTPD=true
      - GIT_TEST_CLONE_2GB=YesPlease
      # t9810 occasionally fails on Travis CI OS X
      # t9816 occasionally fails with "TAP out of sequence errors" on Travis CI OS X