kc3-lang/libbsd

diff --git a/.gitignore b/.gitignore
index 5c3a5ed..a6f6403 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,6 +11,7 @@ ChangeLog
 *.gcda
 *.gcno
 *.sym
+*.map
 .dirstamp
 .deps/
 .libs/
diff --git a/src/Makefile.am b/src/Makefile.am
index 6f2325c..1c350b8 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -28,7 +28,7 @@ libbsd_la_included_sources = \
 
 CLEANFILES =
 EXTRA_DIST = \
-	libbsd.map \
+	libbsd.map.in \
 	libbsd.pc.in \
 	libbsd-ctor.pc.in \
 	libbsd-overlay.pc.in \
@@ -53,6 +53,7 @@ endif
 EXTRA_libbsd_la_DEPENDENCIES = \
 	$(libbsd_la_included_sources) \
 	libbsd.map \
+	libbsd.map.in \
 	# EOL
 libbsd_la_LIBADD = \
 	$(MD5_LIBS) \
@@ -64,7 +65,7 @@ libbsd_la_LDFLAGS = \
 	# EOL
 if HAVE_LINKER_VERSION_SCRIPT
 libbsd_la_LDFLAGS += \
-	-Wl,--version-script=$(srcdir)/libbsd.map \
+	-Wl,--version-script=libbsd.map \
 	# EOL
 else
 libbsd_la_LDFLAGS += \
@@ -194,12 +195,18 @@ endif
 
 DISTCLEANFILES = \
 	libbsd.sym \
+	libbsd.map \
 	# EOL
 
 libbsd_ctor_a_SOURCES = \
 	setproctitle_ctor.c \
 	# EOL
 
+# Generate the library map file with the pre-processor to selectively include
+# symbols depending on the host system, otherwise some linkers might fail.
+libbsd.map: libbsd.map.in
+	$(CPP) $(AM_CPPFLAGS) $(CPPFLAGS) -P - <$(srcdir)/libbsd.map.in >$@
+
 # Generate a simple libtool symbol export list to be used as a fallback if
 # there is no version script support.
 libbsd.sym: libbsd.map
diff --git a/src/libbsd.map b/src/libbsd.map
deleted file mode 100644
index 6c61235..0000000
--- a/src/libbsd.map
+++ /dev/null
@@ -1,199 +0,0 @@
-LIBBSD_0.0 {
-  global:
-    arc4random;
-    arc4random_stir;
-    arc4random_addrandom;
-
-    bsd_getopt;
-    optreset;
-
-    errc;
-    warnc;
-    verrc;
-    vwarnc;
-
-    fgetln;
-    fmtcheck;
-    heapsort;
-    humanize_number;
-
-    /* XXX: Already provided by glibc, remove. */
-    inet_net_pton;
-
-    getprogname;
-    setprogname;
-
-    strlcpy;
-    strlcat;
-
-    setmode;
-    getmode;
-
-    vis;
-    strvis;
-    strvisx;
-    unvis;
-    strunvis;
-    strunvisx;
-
-    /* The following functions are provided via the system libc or libmd
-     * implementations. */
-    MD5Init;
-    MD5Update;
-    MD5Pad;
-    MD5Final;
-    MD5Transform;
-    MD5End;
-    MD5File;
-    MD5FileChunk;
-    MD5Data;
-
-  local:
-    *;
-};
-
-LIBBSD_0.1 {
-    strmode;
-
-    /* Private symbol, but libkvm uses it. */
-    __fdnlist;
-    nlist;
-} LIBBSD_0.0;
-
-LIBBSD_0.2 {
-    strtonum;
-
-    strnvis;
-    strnunvis;
-
-    dehumanize_number;
-
-    readpassphrase;
-
-    flopen;
-
-    pidfile_open;
-    pidfile_write;
-    pidfile_close;
-    pidfile_remove;
-
-    arc4random_buf;
-    arc4random_uniform;
-} LIBBSD_0.1;
-
-LIBBSD_0.3 {
-    reallocf;
-    getpeereid;
-
-    mergesort;
-    radixsort;
-    sradixsort;
-
-    fpurge;
-} LIBBSD_0.2;
-
-LIBBSD_0.4 {
-    closefrom;
-    expand_number;
-} LIBBSD_0.3;
-
-LIBBSD_0.5 {
-    fgetwln;
-    fparseln;
-
-    /* Introduced in 0.2 as a stub, implemented in 0.5. */
-    setproctitle;
-
-    strnstr;
-
-    wcslcat;
-    wcslcpy;
-} LIBBSD_0.4;
-
-LIBBSD_0.6 {
-    /* Exported to cope with the constructor+dlopen+threads mess. */
-    setproctitle_init;
-} LIBBSD_0.5;
-
-LIBBSD_0.7 {
-    getbsize;
-
-    /* This symbol might not be present on some specific systems, such
-     * as musl based ones. It might need to be removed on SOVERSION bump,
-     * as it cannot be portabily implemented everywhere. */
-    funopen;
-
-    reallocarray;
-
-    sl_init;
-    sl_add;
-    sl_free;
-    sl_find;
-
-    _time32_to_time;
-    _time_to_time32;
-    _time64_to_time;
-    _time_to_time64;
-    _time_to_long;
-    _long_to_time;
-    _time_to_int;
-    _int_to_time;
-} LIBBSD_0.6;
-
-LIBBSD_0.8 {
-    explicit_bzero;
-} LIBBSD_0.7;
-
-LIBBSD_0.9 {
-    flopenat;
-
-    pidfile_fileno;
-
-    strtoi;
-    strtou;
-
-    nvis;
-    snvis;
-    stravis;
-    strenvisx;
-    strnunvisx;
-    strsenvisx;
-    strsnvis;
-    strsnvisx;
-    strsvis;
-    strsvisx;
-    svis;
-} LIBBSD_0.8;
-
-LIBBSD_0.9.1 {
-    /* The strnvis() and strnunvis() symbols changed prototype to match
-     * the NetBSD implementation. Provided as versioned nodes in 0.9.1, and
-     * exposed here explicitly so that we can redirect at compile-time. */
-    strnvis_netbsd;
-    strnunvis_netbsd;
-} LIBBSD_0.9;
-
-LIBBSD_0.10.0 {
-    /* These BSD extensions are available on GNU systems, but not on other
-     * systems such as Windows or musl libc based ones. */
-    vwarn;
-    vwarnx;
-    warn;
-    warnx;
-    verr;
-    verrx;
-    err;
-    errx;
-} LIBBSD_0.9.1;
-
-LIBBSD_0.11.0 {
-    strnvisx;
-
-    recallocarray;
-    freezero;
-
-    gid_from_group;
-    group_from_gid;
-    uid_from_user;
-    user_from_uid;
-} LIBBSD_0.10.0;
diff --git a/src/libbsd.map.in b/src/libbsd.map.in
new file mode 100644
index 0000000..06550ea
--- /dev/null
+++ b/src/libbsd.map.in
@@ -0,0 +1,201 @@
+#include "config.h"
+
+LIBBSD_0.0 {
+  global:
+    arc4random;
+    arc4random_stir;
+    arc4random_addrandom;
+
+    bsd_getopt;
+    optreset;
+
+    errc;
+    warnc;
+    verrc;
+    vwarnc;
+
+    fgetln;
+    fmtcheck;
+    heapsort;
+    humanize_number;
+
+    /* XXX: Already provided by glibc, remove. */
+    inet_net_pton;
+
+    getprogname;
+    setprogname;
+
+    strlcpy;
+    strlcat;
+
+    setmode;
+    getmode;
+
+    vis;
+    strvis;
+    strvisx;
+    unvis;
+    strunvis;
+    strunvisx;
+
+    /* The following functions are provided via the system libc or libmd
+     * implementations. */
+    MD5Init;
+    MD5Update;
+    MD5Pad;
+    MD5Final;
+    MD5Transform;
+    MD5End;
+    MD5File;
+    MD5FileChunk;
+    MD5Data;
+
+  local:
+    *;
+};
+
+LIBBSD_0.1 {
+    strmode;
+
+    /* Private symbol, but libkvm uses it. */
+    __fdnlist;
+    nlist;
+} LIBBSD_0.0;
+
+LIBBSD_0.2 {
+    strtonum;
+
+    strnvis;
+    strnunvis;
+
+    dehumanize_number;
+
+    readpassphrase;
+
+    flopen;
+
+    pidfile_open;
+    pidfile_write;
+    pidfile_close;
+    pidfile_remove;
+
+    arc4random_buf;
+    arc4random_uniform;
+} LIBBSD_0.1;
+
+LIBBSD_0.3 {
+    reallocf;
+    getpeereid;
+
+    mergesort;
+    radixsort;
+    sradixsort;
+
+    fpurge;
+} LIBBSD_0.2;
+
+LIBBSD_0.4 {
+    closefrom;
+    expand_number;
+} LIBBSD_0.3;
+
+LIBBSD_0.5 {
+    fgetwln;
+    fparseln;
+
+    /* Introduced in 0.2 as a stub, implemented in 0.5. */
+    setproctitle;
+
+    strnstr;
+
+    wcslcat;
+    wcslcpy;
+} LIBBSD_0.4;
+
+LIBBSD_0.6 {
+    /* Exported to cope with the constructor+dlopen+threads mess. */
+    setproctitle_init;
+} LIBBSD_0.5;
+
+LIBBSD_0.7 {
+    getbsize;
+
+    /* This symbol might not be present on some specific systems, such
+     * as musl based ones. It might need to be removed on SOVERSION bump,
+     * as it cannot be portabily implemented everywhere. */
+    funopen;
+
+    reallocarray;
+
+    sl_init;
+    sl_add;
+    sl_free;
+    sl_find;
+
+    _time32_to_time;
+    _time_to_time32;
+    _time64_to_time;
+    _time_to_time64;
+    _time_to_long;
+    _long_to_time;
+    _time_to_int;
+    _int_to_time;
+} LIBBSD_0.6;
+
+LIBBSD_0.8 {
+    explicit_bzero;
+} LIBBSD_0.7;
+
+LIBBSD_0.9 {
+    flopenat;
+
+    pidfile_fileno;
+
+    strtoi;
+    strtou;
+
+    nvis;
+    snvis;
+    stravis;
+    strenvisx;
+    strnunvisx;
+    strsenvisx;
+    strsnvis;
+    strsnvisx;
+    strsvis;
+    strsvisx;
+    svis;
+} LIBBSD_0.8;
+
+LIBBSD_0.9.1 {
+    /* The strnvis() and strnunvis() symbols changed prototype to match
+     * the NetBSD implementation. Provided as versioned nodes in 0.9.1, and
+     * exposed here explicitly so that we can redirect at compile-time. */
+    strnvis_netbsd;
+    strnunvis_netbsd;
+} LIBBSD_0.9;
+
+LIBBSD_0.10.0 {
+    /* These BSD extensions are available on GNU systems, but not on other
+     * systems such as Windows or musl libc based ones. */
+    vwarn;
+    vwarnx;
+    warn;
+    warnx;
+    verr;
+    verrx;
+    err;
+    errx;
+} LIBBSD_0.9.1;
+
+LIBBSD_0.11.0 {
+    strnvisx;
+
+    recallocarray;
+    freezero;
+
+    gid_from_group;
+    group_from_gid;
+    uid_from_user;
+    user_from_uid;
+} LIBBSD_0.10.0;