libbsd: Branch 'main' - 3 commits

[GitLab Mirror]

 configure.ac             |    8 +++++++-
 include/Makefile.am      |    2 +-
 src/libbsd-overlay.pc.in |    1 +
 3 files changed, 9 insertions(+), 2 deletions(-)

New commits:
commit 70f49a7028adac9ee7e336d8f3b1c16b6636caa6
Author: Guillem Jover <guillem at hadrons.org>
Date:   Wed Feb 28 04:50:34 2024 +0100

    Release libbsd 0.12.1

diff --git a/configure.ac b/configure.ac
index ddbaca9..5a003e1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -18,7 +18,7 @@ AM_SILENT_RULES([yes])
 
 SOVERSION_MAJOR=0
 SOVERSION_MINOR=12
-SOVERSION_PATCH=0
+SOVERSION_PATCH=1
 
 SOVERSION="$SOVERSION_MAJOR:$SOVERSION_MINOR:$SOVERSION_PATCH"
 AC_SUBST([SOVERSION])
commit b6ccd032014cdf214e7c8c2b456ca921ba35d8f6
Author: Guillem Jover <guillem at hadrons.org>
Date:   Wed Feb 28 04:44:02 2024 +0100

    build: Add a comment to libbsd-overlay.pc about -isystem usage
    
    Add the reasoning for why we use -isystem instead of -I, to avoid
    confusing unsuspecting readers of the file.
    
    Prompted-by: Alejandro Colomar <alx at kernel.org>

diff --git a/src/libbsd-overlay.pc.in b/src/libbsd-overlay.pc.in
index 0455f22..7ef4e4d 100644
--- a/src/libbsd-overlay.pc.in
+++ b/src/libbsd-overlay.pc.in
@@ -9,4 +9,5 @@ Version: @VERSION@
 URL: https://libbsd.freedesktop.org/
 Libs: -L${libdir} -lbsd
 Libs.private: @LIBBSD_LIBS@ @MD5_LIBS@
+# We use -isystem instead of -I due the overlay via #include_next usage.
 Cflags: -isystem ${includedir}/bsd -DLIBBSD_OVERLAY
commit 08188f3c13ee2ddd58a62936ff01ccd67bb034d8
Author: Guillem Jover <guillem at hadrons.org>
Date:   Wed Feb 28 04:37:44 2024 +0100

    build: Install err.h if either of the err or errc modules are built
    
    Both modules expose their functions in err.h, so we need to install it
    whenever any of them is being built.
    
    Reported-by: Alejandro Colomar <alx at kernel.org>

diff --git a/configure.ac b/configure.ac
index cc09d8b..ddbaca9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -357,6 +357,11 @@ AS_IF([test "$abi_name_from_id" = "yes" || test "$abi_id_from_name" = "yes"], [
 ], [
   abi_pwcache=no
 ])
+AS_IF([test "$abi_err" = "yes" || test "$abi_errc" = "yes"], [
+  abi_err_h=yes
+], [
+  abi_err_h=no
+])
 
 AM_CONDITIONAL([OS_WINDOWS], [test "x$is_windows" = "xyes"])
 
@@ -547,6 +552,7 @@ LIBBSD_SELECT_ABI([arc4random_stir], [arc4random_stir()/arc4random_addrandom()])
 LIBBSD_SELECT_ABI([asprintf], [vasprintf()/asprintf()])
 LIBBSD_SELECT_ABI([bsd_getopt], [BSD getopt()])
 LIBBSD_SELECT_ABI([closefrom], [closefrom()])
+LIBBSD_SELECT_ABI([err_h], [err.h header])
 LIBBSD_SELECT_ABI([err], [err API])
 LIBBSD_SELECT_ABI([errc], [errc API])
 LIBBSD_SELECT_ABI([expand_number], [expand_number()])
diff --git a/include/Makefile.am b/include/Makefile.am
index 52b78be..cf2713e 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -21,7 +21,7 @@ nobase_include_HEADERS = \
 	bsd/wchar.h \
 	# EOL
 
-if ABI_ERR
+if ABI_ERR_H
 nobase_include_HEADERS += \
 	bsd/err.h \
 	# EOL