Skip to content

Commit 46a3ab7

Browse files
carenasgitster
authored andcommitted
config.mak.uname: set NO_MEMMEM only for functional version
FreeBSD 6 introduced memmem(), but the implementation diverged from what was standard everywhere else (including our "compat" fallback). FreeBSD 10.4 (went EOL in 2018) corrected the functionality bugs but kept a suboptimal implementation until FreeBSD 11.4 (the last version of FreeBSD 11, that went EOL in September 2021). Let's draw the line to require FreeBSD 12 or newer, which allows us to drop the special casing of FreeBSD 4.x and rely on the platform implementation of memmem() unconditionally for all versions that are still being supported. Suggested-by: Brad Smith <[email protected]> Helped-by: brian m. carlson <[email protected]> Signed-off-by: Carlo Marcelo Arenas Belón <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent d50a5e8 commit 46a3ab7

File tree

1 file changed

+3
-6
lines changed

1 file changed

+3
-6
lines changed

config.mak.uname

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -273,16 +273,13 @@ ifeq ($(uname_S),FreeBSD)
273273
ifeq ($(firstword $(subst -, ,$(uname_R))),10.1)
274274
OLD_ICONV = YesPlease
275275
endif
276-
NO_MEMMEM = YesPlease
276+
ifeq ($(shell v=$(uname_R) && test $${v%%.*} -lt 12 && echo 1),1)
277+
NO_MEMMEM = UnfortunatelyYes
278+
endif
277279
BASIC_CFLAGS += -I/usr/local/include
278280
BASIC_LDFLAGS += -L/usr/local/lib
279281
DIR_HAS_BSD_GROUP_SEMANTICS = YesPlease
280282
USE_ST_TIMESPEC = YesPlease
281-
ifeq ($(shell expr "$(uname_R)" : '4\.'),2)
282-
PTHREAD_LIBS = -pthread
283-
NO_UINTMAX_T = YesPlease
284-
NO_STRTOUMAX = YesPlease
285-
endif
286283
PYTHON_PATH = /usr/local/bin/python
287284
PERL_PATH = /usr/local/bin/perl
288285
HAVE_PATHS_H = YesPlease

0 commit comments

Comments
 (0)