libbsd: Branch 'master' - 2 commits
Guillem Jover
guillem at kemper.freedesktop.org
Sat Feb 13 08:47:42 CET 2016
COPYING | 2 +-
README | 13 +++++++++----
configure.ac | 10 ++++++++++
src/Makefile.am | 2 ++
src/libbsd-ctor.pc.in | 2 +-
src/libbsd-overlay.pc.in | 2 +-
src/libbsd.pc.in | 2 +-
src/progname.c | 7 ++++---
src/setproctitle.c | 2 +-
9 files changed, 30 insertions(+), 12 deletions(-)
New commits:
commit b7ce33cf5191b99b5edcb0cde3fa5a4950cbe451
Author: Guillem Jover <guillem at hadrons.org>
Date: Fri Feb 12 22:56:09 2016 +0100
build: Support clock_gettime() provided in librt
In older glibc versions (< 2.17) clock_gettime() is in librt. Add a
check for this to avoid build breakage for programs/libraries that
use libbsd on such systems.
Based-on-patch-by: Gustavo Zacarias <gustavo at zacarias.com.ar>
Signed-off-by: Guillem Jover <guillem at hadrons.org>
diff --git a/configure.ac b/configure.ac
index d334774..fe45b5c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -44,6 +44,16 @@ AC_SUBST([TESTU01_LIBS])
AM_CONDITIONAL([HAVE_LIBTESTU01],
[test "x$ac_cv_lib_testu01_unif01_CreateExternGenBits" = "xyes"])
+# In old glibc versions (< 2.17) clock_gettime() is in librt.
+AS_CASE([$host_os],
+ [*-gnu], [
+ saved_LIBS="$LIBS"
+ AC_SEARCH_LIBS([clock_gettime], [rt], [CLOCK_GETTIME_LIBS="-lrt"])
+ AC_SUBST([CLOCK_GETTIME_LIBS])
+ LIBS="$saved_LIBS"
+ ]
+)
+
# Checks for header files.
AC_CHECK_HEADERS([sys/ndir.h sys/dir.h ndir.h dirent.h])
diff --git a/src/Makefile.am b/src/Makefile.am
index 4649937..ad83dbf 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -52,6 +52,8 @@ hash/md5hl.c: $(srcdir)/hash/helper.c
libbsd_la_DEPENDENCIES = \
$(libbsd_la_included_sources) \
libbsd.map
+libbsd_la_LIBADD = \
+ $(CLOCK_GETTIME_LIBS)
libbsd_la_LDFLAGS = \
-Wl,--version-script=$(srcdir)/libbsd.map \
-version-number $(LIBBSD_ABI)
commit ed84bec5aa93030b09988c3d2e0e4d6411d0e914
Author: Guillem Jover <guillem at hadrons.org>
Date: Wed Feb 10 10:38:51 2016 +0100
Switch URLs from http or git to https
diff --git a/COPYING b/COPYING
index d04b250..4704162 100644
--- a/COPYING
+++ b/COPYING
@@ -1,4 +1,4 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Files:
*
diff --git a/README b/README
index af221e6..d516db0 100644
--- a/README
+++ b/README
@@ -9,7 +9,7 @@ code over and over again on each project.
Releases
--------
- <http://libbsd.freedesktop.org/releases/>
+ <https://libbsd.freedesktop.org/releases/>
Mailing List
@@ -17,7 +17,7 @@ Mailing List
The subscription interface and web archives can be found at:
- <http://lists.freedesktop.org/mailman/listinfo/libbsd>
+ <https://lists.freedesktop.org/mailman/listinfo/libbsd>
The mail address is:
@@ -27,5 +27,10 @@ The mail address is:
Source Repository
-----------------
- <http://cgit.freedesktop.org/libbsd>
- <git://anongit.freedesktop.org/git/libbsd>
+The master repository can be browsed at:
+
+ <https://cgit.freedesktop.org/libbsd>
+
+and cloned from:
+
+ <https://anongit.freedesktop.org/git/libbsd>
diff --git a/src/libbsd-ctor.pc.in b/src/libbsd-ctor.pc.in
index 117b823..d183904 100644
--- a/src/libbsd-ctor.pc.in
+++ b/src/libbsd-ctor.pc.in
@@ -6,7 +6,7 @@ includedir=@includedir@
Name: libbsd-ctor
Description: Automatic constructor functions for libbsd
Version: @VERSION@
-URL: http://libbsd.freedesktop.org/
+URL: https://libbsd.freedesktop.org/
Cflags: -I${includedir}
Libs: -L${libdir} -Wl,-z,nodlopen -Wl,-u,libbsd_init_func -lbsd-ctor
Requires: libbsd
diff --git a/src/libbsd-overlay.pc.in b/src/libbsd-overlay.pc.in
index 2bbb1e2..ac8bf89 100644
--- a/src/libbsd-overlay.pc.in
+++ b/src/libbsd-overlay.pc.in
@@ -6,6 +6,6 @@ includedir=@includedir@
Name: libbsd
Description: Utility functions from BSD systems (overlay)
Version: @VERSION@
-URL: http://libbsd.freedesktop.org/
+URL: https://libbsd.freedesktop.org/
Libs: -L${libdir} -lbsd
Cflags: -isystem ${includedir}/bsd -DLIBBSD_OVERLAY
diff --git a/src/libbsd.pc.in b/src/libbsd.pc.in
index 9f97323..d141fea 100644
--- a/src/libbsd.pc.in
+++ b/src/libbsd.pc.in
@@ -6,6 +6,6 @@ includedir=@includedir@
Name: libbsd
Description: Utility functions from BSD systems
Version: @VERSION@
-URL: http://libbsd.freedesktop.org/
+URL: https://libbsd.freedesktop.org/
Libs: -L${libdir} -lbsd
Cflags: -I${includedir}
diff --git a/src/progname.c b/src/progname.c
index 9bc5e4b..10c3701 100644
--- a/src/progname.c
+++ b/src/progname.c
@@ -25,9 +25,10 @@
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-/*
- Rejected in glibc (http://sourceware.org/ml/libc-alpha/2006-03/msg00125.html)
-*/
+/*
+ * Rejected in glibc
+ * <https://sourceware.org/ml/libc-alpha/2006-03/msg00125.html>.
+ */
#include <errno.h>
#include <string.h>
diff --git a/src/setproctitle.c b/src/setproctitle.c
index 11d8f7a..c18c61c 100644
--- a/src/setproctitle.c
+++ b/src/setproctitle.c
@@ -56,7 +56,7 @@ spt_min(size_t a, size_t b)
/*
* For discussion on the portability of the various methods, see
- * http://lists.freebsd.org/pipermail/freebsd-stable/2008-June/043136.html
+ * https://lists.freebsd.org/pipermail/freebsd-stable/2008-June/043136.html
*/
static int
spt_clearenv(void)
More information about the libbsd
mailing list