From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 25 Apr 2025 00:25:34 +0000 (-0700)
Subject: Merge branch 'rj/build-tweaks'
X-Git-Tag: v2.50.0-rc0~80
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=028c43269e50b65844c0b70557a2b9d5d4f21bd7;p=thirdparty%2Fgit.git

Merge branch 'rj/build-tweaks'

Various build tweaks, including CSPRNG selection on some platforms.

* rj/build-tweaks:
  config.mak.uname: set CSPRNG_METHOD to getrandom on Linux
  config.mak.uname: add arc4random to the cygwin build
  config.mak.uname: add sysinfo() configuration for cygwin
  builtin/gc.c: correct RAM calculation when using sysinfo
  config.mak.uname: add clock_gettime() to the cygwin build
  config.mak.uname: add HAVE_GETDELIM to the cygwin section
  config.mak.uname: only set NO_REGEX on cygwin for v1.7
  config.mak.uname: add a note about NO_STRLCPY for Linux
  Makefile: remove NEEDS_LIBRT build variable
  meson.build: set default help format to html on windows
  meson.build: only set build variables for non-default values
  Makefile: only set some BASIC_CFLAGS when RUNTIME_PREFIX is set
  meson.build: remove -DCURL_DISABLE_TYPECHECK
---

028c43269e50b65844c0b70557a2b9d5d4f21bd7
diff --cc meson.build
index b906e78d89,8f8a258064..410bbf93da
--- a/meson.build
+++ b/meson.build
@@@ -740,8 -703,31 +737,31 @@@ libgit_c_args = 
    '-DGIT_LOCALE_PATH="' + get_option('localedir') + '"',
    '-DGIT_MAN_PATH="' + get_option('mandir') + '"',
    '-DPAGER_ENV="' + get_option('pager_environment') + '"',
 -  '-DSHELL_PATH="' + fs.as_posix(shell.full_path()) + '"',
 +  '-DSHELL_PATH="' + fs.as_posix(target_shell.full_path()) + '"',
  ]
+ 
+ editor_opt = get_option('default_editor')
+ if editor_opt != '' and editor_opt != 'vi'
+   libgit_c_args += '-DDEFAULT_EDITOR="' + editor_opt + '"'
+ endif
+ 
+ pager_opt = get_option('default_pager')
+ if pager_opt != '' and pager_opt != 'less'
+   libgit_c_args += '-DDEFAULT_PAGER="' + pager_opt + '"'
+ endif
+ 
+ help_format_opt = get_option('default_help_format')
+ if help_format_opt == 'platform'
+   if host_machine.system() == 'windows'
+     help_format_opt = 'html'
+   else
+     help_format_opt = 'man'
+   endif
+ endif
+ if help_format_opt != 'man'
+     libgit_c_args += '-DDEFAULT_HELP_FORMAT="' + help_format_opt + '"'
+ endif
+ 
  libgit_include_directories = [ '.' ]
  libgit_dependencies = [ ]