Build everything as PIC by default; prepare for 0.4.0.1

7 files changed, 40 insertions, 30 deletions

diff --git a/COPYING b/COPYING
index ca90f6c..763ff3e 100644
--- a/COPYING
+++ b/COPYING
@@ -1,4 +1,4 @@
-Copyright (c) 2015-2018 Laurent Bercot <ska-skaware@skarnet.org>
+Copyright (c) 2015-2019 Laurent Bercot <ska-skaware@skarnet.org>
 
 Permission to use, copy, modify, and distribute this software for any
 purpose with or without fee is hereby granted, provided that the above
diff --git a/INSTALL b/INSTALL
index affa94e..567390e 100644
--- a/INSTALL
+++ b/INSTALL
@@ -6,15 +6,15 @@ Build Instructions
 
   - A Linux-based system with a standard C development environment
   - GNU make version 3.81 or later
-  - skalibs version 2.6.4.0 or later: http://skarnet.org/software/skalibs/
+  - skalibs version 2.8.0.0 or later: http://skarnet.org/software/skalibs/
 
  The scripts generated by the s6-linux-init-maker program have some
 additional dependencies:
 
-  - execline version 2.3.0.4 or later: http://skarnet.org/software/execline/
-  - s6-portable-utils version 2.2.1.1 or later: http://skarnet.org/software/s6-portable-utils/
-  - s6-linux-utils version 2.4.0.2 or later: http://skarnet.org/software/s6-linux-utils/
-  - s6 version 2.7.1.0 or later: http://skarnet.org/software/s6/
+  - execline version 2.5.1.0 or later: http://skarnet.org/software/execline/
+  - s6-portable-utils version 2.2.1.3 or later: http://skarnet.org/software/s6-portable-utils/
+  - s6-linux-utils version 2.5.0.1 or later: http://skarnet.org/software/s6-linux-utils/
+  - s6 version 2.8.0.0 or later: http://skarnet.org/software/s6/
 
  This software is Linux-specific. It will run on a Linux kernel,
 version 2.6.32 or later. However, it should not be too hard to port to
diff --git a/NEWS b/NEWS
index df33cd5..1320ec7 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,12 @@
 Changelog for s6-linux-init.
 
+In 0.4.0.1
+----------
+
+ - Compatibility with skalibs-2.8.0.0.
+ - Everything now builds as PIC by default.
+
+
 In 0.4.0.0
 ----------
 
@@ -28,4 +35,3 @@ In 0.3.0.0
  - Added this NEWS file. :)
  - Major types overhaul to make them more POSIXly correct:
 compatibility with skalibs-2.5.0.0.
-
diff --git a/configure b/configure
index 9686932..9e4dc0a 100755
--- a/configure
+++ b/configure
@@ -40,7 +40,7 @@ Optional features:
   --disable-static              do not build static libraries [enabled]
   --disable-allstatic           do not prefer linking against static libraries [enabled]
   --enable-static-libc          make entirely static binaries [disabled]
-  --enable-all-pic              build everything as PIC [enabled iff toolchain builds PIE]
+  --disable-all-pic             do not build executables or static libs as PIC [enabled]
   --enable-slashpackage[=ROOT]  assume /package installation at ROOT [disabled]
   --enable-absolute-paths       do not rely on PATH to access this package's binaries,
                                   hardcode absolute BINDIR/foobar paths instead [disabled]
@@ -143,7 +143,7 @@ sysdeps='$prefix/lib/skalibs/sysdeps'
 manualsysdeps=false
 shared=false
 static=true
-allpic=detect
+allpic=true
 slashpackage=false
 abspath=false
 sproot=
@@ -303,20 +303,6 @@ if [ "x$target" != "x$(cat $sysdeps/target)" ] ; then
   exit 1
 fi
 
-if test $allpic = detect ; then
-  echo "Checking whether we need to build everything as PIC..."
-  if $CC_AUTO $CPPFLAGS_AUTO $CPPFLAGS $CPPFLAGS_POST $CFLAGS_AUTO $CFLAGS $CFLAGS_POST -dM -E - < /dev/null | grep -qF __PIE__ ; then
-    allpic=true
-    echo "  ... yes"
-  else
-    allpic=false
-    echo "  ... no"
-  fi
-fi
-if $allpic ; then
-  tryflag CFLAGS_AUTO -fPIC
-fi
-
 spawn_lib=$(cat $sysdeps/spawn.lib)
 socket_lib=$(cat $sysdeps/socket.lib)
 sysclock_lib=$(cat $sysdeps/sysclock.lib)
@@ -324,6 +310,9 @@ tainnow_lib=$(cat $sysdeps/tainnow.lib)
 timer_lib=$(cat $sysdeps/timer.lib)
 util_lib=$(cat $sysdeps/util.lib)
 
+if $allpic ; then
+  tryflag CFLAGS_AUTO -fPIC
+fi
 tryflag CFLAGS_AUTO -std=c99
 tryflag CFLAGS -fomit-frame-pointer
 tryflag CFLAGS_AUTO -fno-exceptions
diff --git a/doc/index.html b/doc/index.html
index c8d7e7e..41c7139 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -50,15 +50,15 @@ a small FAQ.
  <li> A Linux-based system with a standard C development environment </li>
  <li> GNU make, version 3.81 or later </li>
  <li> <a href="//skarnet.org/software/skalibs/">skalibs</a> version
-2.6.4.0 or later </li>
+2.8.0.0 or later </li>
  <li> <a href="//skarnet.org/software/execline/">execline</a> version
-2.3.0.4 or later </li>
+2.5.1.0 or later </li>
  <li> <a href="//skarnet.org/software/s6-portable-utils/">s6-portable-utils</a> version
-2.2.1.1 or later </li>
+2.2.1.3 or later </li>
  <li> <a href="//skarnet.org/software/s6-linux-utils/">s6-linux-utils</a> version
-2.4.0.2 or later </li>
+2.5.0.1 or later </li>
  <li> <a href="//skarnet.org/software/s6/">s6</a> version
-2.7.1.0 or later </li>
+2.8.0.0 or later </li>
 </ul>
 
 <p>
@@ -87,7 +87,7 @@ against the shared version of the skalibs library, it also becomes a
 
 <ul>
  <li> The current released version of s6-linux-init is
-<a href="s6-linux-init-0.4.0.0.tar.gz">0.4.0.0</a>. </li>
+<a href="s6-linux-init-0.4.0.1.tar.gz">0.4.0.1</a>. </li>
  <li> Alternatively, you can checkout a copy of the
 <a href="//git.skarnet.org/cgi-bin/cgit.cgi/s6-linux-init/">s6-linux-init
 git repository</a>:
diff --git a/doc/upgrade.html b/doc/upgrade.html
index 7a5d279..f8ea901 100644
--- a/doc/upgrade.html
+++ b/doc/upgrade.html
@@ -18,6 +18,21 @@
 
 <h1> What has changed in s6-linux-init </h1>
 
+<h2> in 0.4.0.1 </h2>
+
+<ul>
+ <li> <a href="//skarnet.org/software/skalibs/">skalibs</a>
+dependency bumped to 2.8.0.0. </li>
+ <li> <a href="//skarnet.org/software/execline/">execline</a>
+dependency bumped to 2.5.1.0. </li>
+ <li> <a href="//skarnet.org/software/s6-portable-utils/">s6-portable-utils</a>
+dependency bumped to 2.2.1.3. </li>
+ <li> <a href="//skarnet.org/software/s6-linux-utils/">s6-linux-utils</a>
+dependency bumped to 2.5.0.1. </li>
+ <li> <a href="//skarnet.org/software/s6/">s6</a>
+dependency bumped to 2.8.0.0. </li>
+</ul>
+
 <h2> in 0.4.0.0 </h2>
 
 <ul>
diff --git a/package/info b/package/info
index f7c3758..8a7b49e 100644
--- a/package/info
+++ b/package/info
@@ -1,4 +1,4 @@
 package=s6-linux-init
-version=0.4.0.0
+version=0.4.0.1
 category=admin
 package_macro_name=S6_LINUX_INIT