From bd4c3768a5b02b4ceca03942721ff37df78ab192 Mon Sep 17 00:00:00 2001
From: Laurent Bercot <ska-skaware@skarnet.org>
Date: Fri, 18 Dec 2020 23:41:07 +0000
Subject:  Prepare for 2.5.1.4

---
 INSTALL          |  2 +-
 NEWS             |  6 ++++++
 configure        | 14 +++++++-------
 doc/index.html   |  4 ++--
 doc/upgrade.html |  7 +++++++
 package/info     |  2 +-
 6 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/INSTALL b/INSTALL
index 2d8b2c7..9b5a8ee 100644
--- a/INSTALL
+++ b/INSTALL
@@ -6,7 +6,7 @@ Build Instructions
 
   - A Linux-based system with a standard C development environment
   - GNU make version 3.81 or later
-  - skalibs version 2.9.3.0 or later: https://skarnet.org/software/skalibs/
+  - skalibs version 2.10.0.0 or later: https://skarnet.org/software/skalibs/
 
  This software is Linux-specific. It will run on a Linux kernel,
 version 3.5 or later.
diff --git a/NEWS b/NEWS
index 93e8753..34ef255 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,11 @@
 Changelog for s6-linux-utils.
 
+In 2.5.1.4
+----------
+
+ - Bugfixes.
+
+
 In 2.5.1.3
 ----------
 
diff --git a/configure b/configure
index aa3f723..c7f25bd 100755
--- a/configure
+++ b/configure
@@ -361,13 +361,6 @@ fi
 
 LDFLAGS_SHARED="${LDFLAGS_SHARED}${addlibdpath}"
 
-if $allstatic ; then
-  LDFLAGS_NOSHARED="${LDFLAGS_NOSHARED}${addlibspath}"
-  tryldflag LDFLAGS_NOSHARED -Wl,--gc-sections
-else
-  LDFLAGS_NOSHARED="${LDFLAGS_NOSHARED}${addlibdpath}"
-fi
-
 if test -z "$vpaths" ; then
   while read dep ; do
     base=$(basename $dep) ;
@@ -376,6 +369,13 @@ if test -z "$vpaths" ; then
   done < package/deps-build  
 fi
 
+if $allstatic ; then
+  LDFLAGS_NOSHARED="${LDFLAGS_NOSHARED}${addlibspath}"
+  tryldflag LDFLAGS_NOSHARED -Wl,--gc-sections
+else
+  LDFLAGS_NOSHARED="${LDFLAGS_NOSHARED}${addlibdpath}"
+fi
+
 echo "Creating config.mak..."
 cmdline=$(quote "$0")
 for i ; do cmdline="$cmdline $(quote "$i")" ; done
diff --git a/doc/index.html b/doc/index.html
index bb18621..e1b0b8a 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -34,7 +34,7 @@
 The Linux kernel must be 3.5 or later. </li>
  <li> GNU make, version 3.81 or later </li>
  <li> <a href="//skarnet.org/software/skalibs/">skalibs</a> version
-2.9.3.0 or later. It's a build-time requirement. It's also a run-time
+2.10.0.0 or later. It's a build-time requirement. It's also a run-time
 requirement if you link against the shared version of the skalibs
 library. </li>
 </ul>
@@ -50,7 +50,7 @@ library. </li>
 
 <ul>
  <li> The current released version of s6-linux-utils is
-<a href="s6-linux-utils-2.5.1.3.tar.gz">2.5.1.3</a>. </li>
+<a href="s6-linux-utils-2.5.1.4.tar.gz">2.5.1.4</a>. </li>
  <li> Alternatively, you can checkout a copy of the
 <a href="//git.skarnet.org/cgi-bin/cgit.cgi/s6-linux-utils/">s6-linux-utils
 git repository</a>:
diff --git a/doc/upgrade.html b/doc/upgrade.html
index 776b59a..e798f94 100644
--- a/doc/upgrade.html
+++ b/doc/upgrade.html
@@ -18,6 +18,13 @@
 
 <h1> What has changed in s6-linux-utils </h1>
 
+<h2> in 2.5.1.4 </h2>
+
+<ul>
+ <li> <a href="//skarnet.org/software/skalibs/">skalibs</a>
+dependency bumped to 2.10.0.0. </li>
+</ul>
+
 <h2> in 2.5.1.3 </h2>
 
 <ul>
diff --git a/package/info b/package/info
index bddefa0..acd6298 100644
--- a/package/info
+++ b/package/info
@@ -1,4 +1,4 @@
 package=s6-linux-utils
-version=2.5.1.3
+version=2.5.1.4
 category=admin
 package_macro_name=S6_LINUX_UTILS
-- 
cgit 1.4.1