[patch 15/15] no-inline.patch
From: Gary V. Vaughan <hidden>
Date: 2016-06-15 22:48:26
Without this patch, git does not compile correctly on HPUX 11.11 and earlier. Compiler support for inline is sometimes buggy, and occasionally missing entirely. This patch adds a test for inline support, and redefines the keyword with the preprocessor if necessary at compile time. --- Makefile | 4 ++++ config.mak.in | 1 + configure.ac | 7 +++++++ 3 files changed, 12 insertions(+) Index: b/Makefile ===================================================================
--- a/Makefile
+++ b/Makefile@@ -1076,6 +1076,10 @@ else BROKEN_PATH_FIX = '/^\# @@BROKEN_PATH_FIX@@$$/d' endif +ifneq (inline,$(INLINE)) + BASIC_CFLAGS += -Dinline=$(INLINE) +endif + ifneq (socklen_t,$(SOCKLEN_T)) BASIC_CFLAGS += -Dsocklen_t=$(SOCKLEN_T) endif
Index: b/configure.ac ===================================================================
--- a/configure.ac
+++ b/configure.ac@@ -307,6 +307,13 @@ GIT_PARSE_WITH(tcltk)) AC_MSG_NOTICE([CHECKS for programs]) # AC_PROG_CC([cc gcc]) +AC_C_INLINE +case $ac_cv_c_inline in + no) AC_SUBST([INLINE], []) ;; + inline | yes) AC_SUBST([INLINE], [inline]) ;; + *) AC_SUBST([INLINE], [$ac_cv_c_inline]) ;; +esac + # which switch to pass runtime path to dynamic libraries to the linker AC_CACHE_CHECK([if linker supports -R], git_cv_ld_dashr, [ SAVE_LDFLAGS="${LDFLAGS}"
Index: b/config.mak.in ===================================================================
--- a/config.mak.in
+++ b/config.mak.in@@ -59,6 +59,7 @@ NO_INET_PTON=@NO_INET_PTON@ NO_ICONV=@NO_ICONV@ OLD_ICONV=@OLD_ICONV@ NO_DEFLATE_BOUND=@NO_DEFLATE_BOUND@ +INLINE=@INLINE@ SOCKLEN_T=@SOCKLEN_T@ FREAD_READS_DIRECTORIES=@FREAD_READS_DIRECTORIES@ SNPRINTF_RETURNS_BOGUS=@SNPRINTF_RETURNS_BOGUS@
--
Gary V. Vaughan (gary@thewrittenword.com)