From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 28 Jul 2016 17:34:44 +0000 (-0700)
Subject: Merge branch 'ew/find-perl-on-freebsd-in-local'
X-Git-Tag: v2.10.0-rc0~75
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/36f99a40a8b2c1bf97adb8ec1459c3079c787bc4?ds=inline;hp=-c

Merge branch 'ew/find-perl-on-freebsd-in-local'

Recent FreeBSD stopped making perl available at /usr/bin/perl;
switch the default the built-in path to /usr/local/bin/perl on not
too ancient FreeBSD releases.

* ew/find-perl-on-freebsd-in-local:
config.mak.uname: correct perl path on FreeBSD
---

36f99a40a8b2c1bf97adb8ec1459c3079c787bc4
diff --combined config.mak.uname
index 22958a8d6f,4cd62bda4f..17fed2f43a
--- a/config.mak.uname
+++ b/config.mak.uname
@@@ -36,8 -36,6 +36,8 @@@ ifeq ($(uname_S),Linux
  	HAVE_DEV_TTY = YesPlease
  	HAVE_CLOCK_GETTIME = YesPlease
  	HAVE_CLOCK_MONOTONIC = YesPlease
 +	# -lrt is needed for clock_gettime on glibc <= 2.16
 +	NEEDS_LIBRT = YesPlease
  	HAVE_GETDELIM = YesPlease
  	SANE_TEXT_GREP=-a
  endif
@@@ -205,6 -203,7 +205,7 @@@ ifeq ($(uname_S),FreeBSD
  		NO_STRTOUMAX = YesPlease
  	endif
  	PYTHON_PATH = /usr/local/bin/python
+ 	PERL_PATH = /usr/local/bin/perl
  	HAVE_PATHS_H = YesPlease
  	GMTIME_UNRELIABLE_ERRORS = UnfortunatelyYes
  	HAVE_BSD_SYSCTL = YesPlease