admin/git
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'bs/config-mak-freebsd'

Browse Source 
Drop FreeBSD 4 support and assume we are at least at FreeBSD 6 with
memmem() supported.

* bs/config-mak-freebsd:
  build: retire NO_UINTMAX_T
  config.mak.uname: set NO_MEMMEM only for functional version
This commit is contained in:
Junio C Hamano
2025-07-14 11:19:23 -07:00
parent e02d718846 0392f976a7
commit 45c50a10cf
4 changed files with 3 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile
View File

@@ -114,8 +114,6 @@ include shared.mak
# #
# Define NO_INTPTR_T if you don't have intptr_t or uintptr_t. # Define NO_INTPTR_T if you don't have intptr_t or uintptr_t.
# #
# Define NO_UINTMAX_T if you don't have uintmax_t.
#
# Define NEEDS_SOCKET if linking with libc is not enough (SunOS, # Define NEEDS_SOCKET if linking with libc is not enough (SunOS,
# Patrick Mauritz). # Patrick Mauritz).
# #
@@ -1918,9 +1916,6 @@ endif
ifdef NO_INTPTR_T ifdef NO_INTPTR_T
COMPAT_CFLAGS += -DNO_INTPTR_T COMPAT_CFLAGS += -DNO_INTPTR_T
endif endif
ifdef NO_UINTMAX_T
BASIC_CFLAGS += -Duintmax_t=uint32_t
endif
ifdef NO_SOCKADDR_STORAGE ifdef NO_SOCKADDR_STORAGE
ifdef NO_IPV6 ifdef NO_IPV6
BASIC_CFLAGS += -Dsockaddr_storage=sockaddr_in BASIC_CFLAGS += -Dsockaddr_storage=sockaddr_in

9
config.mak.uname
View File

@@ -302,16 +302,13 @@ ifeq ($(uname_S),FreeBSD)
ifeq ($(firstword $(subst -, ,$(uname_R))),10.1) ifeq ($(firstword $(subst -, ,$(uname_R))),10.1)
OLD_ICONV = YesPlease OLD_ICONV = YesPlease
endif endif
NO_MEMMEM = YesPlease ifeq ($(shell v=$(uname_R) && test $${v%%.*} -lt 12 && echo 1),1)
NO_MEMMEM = UnfortunatelyYes
endif
BASIC_CFLAGS += -I/usr/local/include BASIC_CFLAGS += -I/usr/local/include
BASIC_LDFLAGS += -L/usr/local/lib BASIC_LDFLAGS += -L/usr/local/lib
DIR_HAS_BSD_GROUP_SEMANTICS = YesPlease DIR_HAS_BSD_GROUP_SEMANTICS = YesPlease
USE_ST_TIMESPEC = YesPlease USE_ST_TIMESPEC = YesPlease
ifeq ($(shell expr "$(uname_R)" : '4\.'),2)
PTHREAD_LIBS = -pthread
NO_UINTMAX_T = YesPlease
NO_STRTOUMAX = YesPlease
endif
PYTHON_PATH = /usr/local/bin/python PYTHON_PATH = /usr/local/bin/python
PERL_PATH = /usr/local/bin/perl PERL_PATH = /usr/local/bin/perl
HAVE_PATHS_H = YesPlease HAVE_PATHS_H = YesPlease

8
configure.ac
View File

@@ -1148,14 +1148,6 @@ GIT_CHECK_FUNC(strlcpy,
[NO_STRLCPY=YesPlease]) [NO_STRLCPY=YesPlease])
GIT_CONF_SUBST([NO_STRLCPY]) GIT_CONF_SUBST([NO_STRLCPY])
# #
# Define NO_UINTMAX_T if your platform does not have uintmax_t
AC_CHECK_TYPE(uintmax_t,
[NO_UINTMAX_T=],
[NO_UINTMAX_T=YesPlease],[
#include <inttypes.h>
])
GIT_CONF_SUBST([NO_UINTMAX_T])
#
# Define NO_STRTOUMAX if you don't have strtoumax in the C library. # Define NO_STRTOUMAX if you don't have strtoumax in the C library.
GIT_CHECK_FUNC(strtoumax, GIT_CHECK_FUNC(strtoumax,
[NO_STRTOUMAX=], [NO_STRTOUMAX=],

11
meson.build
View File

@@ -1420,17 +1420,6 @@ if compiler.compiles('''
libgit_c_args += '-DHAVE_CLOCK_MONOTONIC' libgit_c_args += '-DHAVE_CLOCK_MONOTONIC'
endif endif
if not compiler.compiles('''
#include <inttypes.h>
void func(void)
{
uintmax_t x = 0;
}
''', name: 'uintmax_t')
libgit_c_args += '-DNO_UINTMAX_T'
endif
has_bsd_sysctl = false has_bsd_sysctl = false
if compiler.has_header('sys/sysctl.h') if compiler.has_header('sys/sysctl.h')
if compiler.compiles(''' if compiler.compiles('''