From dfc83dd740beaa46b637b87b5a804abf1cff7bee Mon Sep 17 00:00:00 2001 From: Laurent Bercot Date: Fri, 12 Aug 2016 13:07:24 +0000 Subject: Add spawn_lib support --- INSTALL | 10 +++++----- configure | 22 +++++++++++----------- doc/index.html | 12 ++++++------ doc/upgrade.html | 15 +++++++++++++++ package/info | 2 +- 5 files changed, 38 insertions(+), 23 deletions(-) diff --git a/INSTALL b/INSTALL index 5d89f43..74bb27f 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.3.10.0 or later: http://skarnet.org/software/skalibs/ + - skalibs version 2.4.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.1.5.0 or later: http://skarnet.org/software/execline/ - - s6-portable-utils version 2.0.6.0 or later: http://skarnet.org/software/s6-portable-utils/ - - s6-linux-utils version 2.1.0.0 or later: http://skarnet.org/software/s6-linux-utils/ - - s6 version 2.3.0.0 or later: http://skarnet.org/software/s6/ + - execline version 2.2.0.0 or later: http://skarnet.org/software/execline/ + - s6-portable-utils version 2.1.0.0 or later: http://skarnet.org/software/s6-portable-utils/ + - s6-linux-utils version 2.2.0.0 or later: http://skarnet.org/software/s6-linux-utils/ + - s6 version 2.4.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/configure b/configure index ab7279f..32f7ab2 100755 --- a/configure +++ b/configure @@ -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 < A Linux-based system with a standard C development environment
  • GNU make, version 3.81 or later
  • skalibs version -2.3.10.0 or later
    • +2.4.0.0 or later
  • execline version -2.1.5.0 or later
    • +2.2.0.0 or later
  • s6-portable-utils version -2.0.6.0 or later
    • -
  • s6-linux-utils version 2.1.0.0 or later
    • +
  • s6-linux-utils version +2.2.0.0 or later
  • s6 version -2.3.0.0 or later
    • +2.4.0.0 or later

    @@ -86,7 +86,7 @@ against the shared version of the skalibs library, it also becomes a