diff options
| -rw-r--r-- | INSTALL | 2 | ||||
| -rwxr-xr-x | configure | 22 | ||||
| -rw-r--r-- | doc/index.html | 4 | ||||
| -rw-r--r-- | doc/upgrade.html | 6 | ||||
| -rw-r--r-- | package/deps.mak | 2 | ||||
| -rw-r--r-- | package/info | 2 | ||||
| -rw-r--r-- | src/skaembutils/deps-exe/s6-maximumtime | 1 |
7 files changed, 23 insertions, 16 deletions
@@ -6,7 +6,7 @@ Build Instructions - A POSIX-compliant C development environment - GNU make version 3.81 or later - - skalibs version 2.3.10.0 or later: http://skarnet.org/software/skalibs/ + - skalibs version 2.4.0.0 or later: http://skarnet.org/software/skalibs/ This software will run on any operating system that implements POSIX.1-2008, available at: @@ -18,12 +18,12 @@ Installation directories: Fine tuning of the installation directories: --dynlibdir=DIR shared library files [PREFIX/lib] - --bindir=DIR user executables [EPREFIX/bin] + --bindir=BINDIR user executables [EPREFIX/bin] --sbindir=DIR admin executables [EPREFIX/sbin] --libexecdir=DIR package-scoped executables [EPREFIX/libexec] --libdir=DIR static library files [PREFIX/lib/$package] --includedir=DIR C header files [PREFIX/include] - --datadir=DIR global configuration files [PREFIX/etc] + --shebangdir=DIR absolute path for #! invocations [BINDIR] If no --prefix option is given, by default libdir (but not dynlibdir) will be /usr/lib/$package, and includedir will be /usr/include. @@ -133,7 +133,7 @@ bindir='$exec_prefix/bin' sbindir='$exec_prefix/sbin' libdir='$prefix/lib/$package' includedir='$prefix/include' -datadir='$prefix/etc' +shebangdir='$bindir' sysdeps='$prefix/lib/skalibs/sysdeps' manualsysdeps=false shared=false @@ -162,7 +162,7 @@ for arg ; do --sbindir=*) sbindir=${arg#*=} ;; --libdir=*) libdir=${arg#*=} ;; --includedir=*) includedir=${arg#*=} ;; - --datadir=*) datadir=${arg#*=} ;; + --shebangdir=*) shebangdir=${arg#*=} ;; --with-sysdeps=*) sysdeps=${arg#*=} manualsysdeps=true ;; --with-include=*) var=${arg#*=} ; stripdir var ; addincpath="$addincpath -I$var" ;; --with-lib=*) var=${arg#*=} ; stripdir var ; addlibspath="$addlibspath -L$var" ; vpaths="$vpaths $var" ;; @@ -202,7 +202,7 @@ fi # Expand installation directories stripdir prefix -for i in exec_prefix dynlibdir libexecdir bindir sbindir libdir includedir datadir sysdeps sproot ; do +for i in exec_prefix dynlibdir libexecdir bindir sbindir libdir includedir shebangdir sysdeps sproot ; do eval tmp=\${$i} eval $i=$tmp stripdir $i @@ -289,7 +289,7 @@ if [ "x$target" != "x$(cat $sysdeps/target)" ] ; then exit 1 fi -rt_lib=$(cat $sysdeps/rt.lib) +spawn_lib=$(cat $sysdeps/spawn.lib) socket_lib=$(cat $sysdeps/socket.lib) sysclock_lib=$(cat $sysdeps/sysclock.lib) tainnow_lib=$(cat $sysdeps/tainnow.lib) @@ -312,6 +312,8 @@ tryflag CFLAGS_AUTO -fdata-sections tryldflag LDFLAGS_AUTO -Wl,--sort-section=alignment tryldflag LDFLAGS_AUTO -Wl,--sort-common +CPPFLAGS_AUTO="${CPPFLAGS_AUTO}${addincpath}" + if $evenmorestatic ; then LDFLAGS_NOSHARED=-static fi @@ -337,8 +339,6 @@ if test -z "$vpaths" ; then done < package/deps-build fi -CPPFLAGS_AUTO="$CPPFLAGS_AUTO $addincpath" - echo "creating config.mak..." cmdline=$(quote "$0") for i ; do cmdline="$cmdline $(quote "$i")" ; done @@ -358,14 +358,13 @@ bindir := $bindir sbindir := $sbindir libdir := $libdir includedir := $includedir -datadir := $datadir sysdeps := $sysdeps slashpackage := $slashpackage sproot := $sproot version := $version home := $home exthome := $exthome -RT_LIB := ${rt_lib} +SPAWN_LIB := ${spawn_lib} SOCKET_LIB := ${socket_lib} SYSCLOCK_LIB := ${sysclock_lib} TAINNOW_LIB := ${tainnow_lib} @@ -414,16 +413,17 @@ cat <<EOF #define ${package_macro_name}_CONFIG_H #define ${package_macro_name}_VERSION "$version" -#define ${package_macro_name}_ETC "$datadir" EOF if $slashpackage ; then echo "#define ${package_macro_name}_BINPREFIX \"$binprefix/\"" echo "#define ${package_macro_name}_EXTBINPREFIX \"$extbinprefix/\"" echo "#define ${package_macro_name}_LIBEXECPREFIX \"$binprefix/\"" + echo "#define ${package_macro_name}_SHEBANGPREFIX \"$extbinprefix/\"" else echo "#define ${package_macro_name}_BINPREFIX \"\"" echo "#define ${package_macro_name}_EXTBINPREFIX \"\"" echo "#define ${package_macro_name}_LIBEXECPREFIX \"$libexecdir/\"" + echo "#define ${package_macro_name}_SHEBANGPREFIX \"$shebangdir/\"" fi echo echo "#endif" diff --git a/doc/index.html b/doc/index.html index 82a9eb3..e01f1f9 100644 --- a/doc/index.html +++ b/doc/index.html @@ -61,7 +61,7 @@ the package is now used to host specific utilities such as <li> A POSIX-compliant system with a standard C development environment </li> <li> GNU make, version 3.81 or later </li> <li> <a href="http://skarnet.org/software/skalibs/">skalibs</a> version -2.3.10.0 or later. It's a build-time requirement. It's also a run-time +2.4.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> @@ -77,7 +77,7 @@ library. </li> <ul> <li> The current released version of s6-portable-utils is -<a href="s6-portable-utils-2.0.6.0.tar.gz">2.0.6.0</a>. </li> +<a href="s6-portable-utils-2.1.0.0.tar.gz">2.1.0.0</a>. </li> <li> Alternatively, you can checkout a copy of the <a href="http://git.skarnet.org/cgi-bin/cgit.cgi/s6-portable-utils/">s6-portable-utils git repository</a>: diff --git a/doc/upgrade.html b/doc/upgrade.html index eceaeaf..11269dd 100644 --- a/doc/upgrade.html +++ b/doc/upgrade.html @@ -18,6 +18,12 @@ <h1> What has changed in s6-portable-utils </h1> +<h2> in 2.1.0.0 </h2> + +<ul> + <li> skalibs dependency bumped to 2.4.0.0. </li> +</ul> + <h2> in 2.0.6.0 </h2> <ul> diff --git a/package/deps.mak b/package/deps.mak index 008df0e..21e8b59 100644 --- a/package/deps.mak +++ b/package/deps.mak @@ -84,7 +84,7 @@ s6-ln: EXTRA_LIBS := ${SOCKET_LIB} ${TAINNOW_LIB} s6-ln: src/skaembutils/s6-ln.o -lskarnet s6-ls: EXTRA_LIBS := s6-ls: src/skaembutils/s6-ls.o -lskarnet -s6-maximumtime: EXTRA_LIBS := ${TAINNOW_LIB} +s6-maximumtime: EXTRA_LIBS := ${TAINNOW_LIB} ${SPAWN_LIB} s6-maximumtime: src/skaembutils/s6-maximumtime.o -lskarnet s6-mkdir: EXTRA_LIBS := s6-mkdir: src/skaembutils/s6-mkdir.o -lskarnet diff --git a/package/info b/package/info index 9f4008b..8b436ad 100644 --- a/package/info +++ b/package/info @@ -1,4 +1,4 @@ package=s6-portable-utils -version=2.0.6.0 +version=2.1.0.0 category=admin package_macro_name=S6_PORTABLE_UTILS diff --git a/src/skaembutils/deps-exe/s6-maximumtime b/src/skaembutils/deps-exe/s6-maximumtime index 1840bc1..7b74490 100644 --- a/src/skaembutils/deps-exe/s6-maximumtime +++ b/src/skaembutils/deps-exe/s6-maximumtime @@ -1,2 +1,3 @@ -lskarnet ${TAINNOW_LIB} +${SPAWN_LIB} |