From 5e4c6de73a023e480a909aac1eb23d93ceb4d0fa Mon Sep 17 00:00:00 2001 From: Tim van der Molen Date: Mon, 15 Jun 2020 19:51:36 +0200 Subject: Enable --version-sort on systems without strverscmp() The --version-sort option requires strverscmp(), but this is a glibc extension that does not exist on OpenBSD and other systems. To enable --version-sort on those systems, provide an internal implementation of strverscmp(). The implementation is from the musl C library and is MIT-licensed. The build process remains the same: the verscmp flag should be set to 1 only if strverscmp() is available in libc. If verscmp is 0, then the internal implementation is used. --- man/Makefile | 1 - man/feh.pre | 4 ---- 2 files changed, 5 deletions(-) (limited to 'man') diff --git a/man/Makefile b/man/Makefile index acf8629..3be07e3 100644 --- a/man/Makefile +++ b/man/Makefile @@ -13,7 +13,6 @@ all: ${TARGETS} -e 's/\$$MAN_DEBUG\$$/${MAN_DEBUG}/' \ -e 's/\$$MAN_EXIF\$$/${MAN_EXIF}/' \ -e 's/\$$MAN_INOTIFY\$$/${MAN_INOTIFY}/' \ - -e 's/\$$MAN_VERSCMP\$$/${MAN_VERSCMP}/' \ -e 's/\$$MAN_XINERAMA\$$/${MAN_XINERAMA}/' \ < ${@:.1=.pre} > $@ diff --git a/man/feh.pre b/man/feh.pre index c6dae5f..a27f042 100644 --- a/man/feh.pre +++ b/man/feh.pre @@ -32,9 +32,6 @@ Compile-time switches in this build: remote file support: libcurl $MAN_CURL$ . .It -natural sorting option $MAN_VERSCMP$ -. -.It Xinerama multi-monitor support $MAN_XINERAMA$ . .It @@ -887,7 +884,6 @@ output version information and exit. . .It Cm --version-sort . -.Pq optional feature, $MAN_VERSCMP$ in this build When combined with .Cm --sort name , --sort filename , or -- cgit v1.2.3