From 018fc90f1c1e3b50b982cc671bba5fcc4235e020 Mon Sep 17 00:00:00 2001 From: Laurent Bercot Date: Wed, 14 Jan 2015 00:50:25 +0000 Subject: - Parallel build fix - Version updated to 2.0.1.0, release candidate --- COPYING | 2 +- INSTALL | 3 ++- Makefile | 8 ++++---- configure | 5 +++-- doc/index.html | 6 ++++-- doc/upgrade.html | 8 ++++++++ package/deps.mak | 15 ++++++++------- package/info | 2 +- package/targets.mak | 6 ++++++ src/conn-tools/deps-exe/s6-accessrules-cdb-from-fs | 2 +- src/conn-tools/deps-exe/s6-ident-client | 2 +- src/conn-tools/deps-exe/s6-ipcserver-access | 2 +- src/conn-tools/deps-exe/s6-tcpclient | 2 +- src/conn-tools/deps-exe/s6-tcpserver-access | 2 +- tools/gen-deps.sh | 2 +- 15 files changed, 43 insertions(+), 24 deletions(-) diff --git a/COPYING b/COPYING index 63309ba..a49b1ca 100644 --- a/COPYING +++ b/COPYING @@ -1,4 +1,4 @@ -Copyright (c) 2011-2014 Laurent Bercot +Copyright (c) 2011-2015 Laurent Bercot 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 b0206cd..4d45b63 100644 --- a/INSTALL +++ b/INSTALL @@ -6,8 +6,9 @@ Build Instructions - A POSIX-compliant C development environment - GNU make version 4.0 or later - - skalibs version 2.1.0.0 or later: http://skarnet.org/software/skalibs/ + - skalibs version 2.2.0.0 or later: http://skarnet.org/software/skalibs/ - execline version 2.0.1.0 or later: http://skarnet.org/software/execline/ + - s6 version 2.0.1.0 or later: http://skarnet.org/software/s6/ - s6-dns version 2.0.0.1 or later: http://skarnet.org/software/s6-dns/ This software will run on any operating system that implements diff --git a/Makefile b/Makefile index b9eb4ea..c602cad 100644 --- a/Makefile +++ b/Makefile @@ -11,6 +11,8 @@ CC = $(error Please use ./configure first) STATIC_LIBS := SHARED_LIBS := +INTERNAL_LIBS := +EXTRA_TARGETS := -include config.mak include package/targets.mak @@ -32,13 +34,13 @@ STRIP := $(CROSS_COMPILE)strip INSTALL := ./tools/install.sh ALL_BINS := $(LIBEXEC_TARGETS) $(BIN_TARGETS) $(SBIN_TARGETS) -ALL_LIBS := $(SHARED_LIBS) $(STATIC_LIBS) +ALL_LIBS := $(SHARED_LIBS) $(STATIC_LIBS) $(INTERNAL_LIBS) ALL_INCLUDES := $(wildcard src/include/$(package)/*.h) all: $(ALL_LIBS) $(ALL_BINS) $(ALL_INCLUDES) clean: - @exec rm -f $(ALL_LIBS) $(ALL_BINS) $(wildcard src/*/*.o src/*/*.lo) + @exec rm -f $(ALL_LIBS) $(ALL_BINS) $(wildcard src/*/*.o src/*/*.lo) $(EXTRA_TARGETS) distclean: clean @exec rm -f config.mak src/include/${package}/config.h @@ -122,5 +124,3 @@ lib%.so: .PHONY: it all clean distclean tgz strip install install-dynlib install-bin install-sbin install-lib install-include .DELETE_ON_ERROR: - -.NOTPARALLEL: diff --git a/configure b/configure index 056061c..d8d62e8 100755 --- a/configure +++ b/configure @@ -169,8 +169,8 @@ for arg ; do --enable-static|--enable-static=yes) static=true ;; --disable-static|--enable-static=no) static=false ;; --enable-allstatic|--enable-allstatic=yes) allstatic=true ;; - --disable-allstatic|--enable-allstatic=no) allstatic=false ;; - --enable-static-libc|--enable-static-libc=yes) evenmorestatic=true ;; + --disable-allstatic|--enable-allstatic=no) allstatic=false ; evenmorestatic=false ;; + --enable-static-libc|--enable-static-libc=yes) allstatic=true ; evenmorestatic=true ;; --disable-static-libc|--enable-static-libc=no) evenmorestatic=false ;; --enable-slashpackage=*) sproot=${arg#*=} ; slashpackage=true ; ;; --enable-slashpackage) sproot= ; slashpackage=true ;; @@ -358,6 +358,7 @@ vpath lib%a$vpaths EOF if $allstatic ; then echo ".LIBPATTERNS := lib%.a" + echo "DO_ALLSTATIC := 1" vpathd= fi echo "vpath lib%.so$vpathd" diff --git a/doc/index.html b/doc/index.html index bd86df2..a3ce72e 100644 --- a/doc/index.html +++ b/doc/index.html @@ -41,8 +41,10 @@ compiled with IPv6 support, s6-networking is IPv6-ready.
  • A POSIX-compliant system with a standard C development environment
  • GNU make, version 4.0 or later
  • skalibs version -2.1.0.0 or later
    • +2.2.0.0 or later
  • execline version +2.0.1.0 or later
    • +
  • s6 version 2.0.1.0 or later
  • s6-dns version 2.0.0.1 or later
    • @@ -58,7 +60,7 @@ compiled with IPv6 support, s6-networking is IPv6-ready.

    Download

      -
    • The current released version of s6-networking is 2.0.0.1.
      • +
    • The current released version of s6-networking is 2.0.1.0.
    • Alternatively, you can checkout a copy of the s6-networking git repository: 
       git clone git://git.skarnet.org/s6-networking
    diff --git a/doc/upgrade.html b/doc/upgrade.html index d4dfb11..b0ac839 100644 --- a/doc/upgrade.html +++ b/doc/upgrade.html @@ -17,6 +17,14 @@

    What has changed in s6-networking

    +

    in 2.0.1.0

    + +
      +
    • skalibs dependency bumped to 2.2.0.0.
      • +
    • s6 dependency introduced (2.0.1.0)
      • +
    • Separation of superservers into socketbinders and d's
      • +
    +

    in 2.0.0.1

      diff --git a/package/deps.mak b/package/deps.mak index 0c6bd79..ab24798 100644 --- a/package/deps.mak +++ b/package/deps.mak @@ -26,10 +26,10 @@ src/conn-tools/s6-tcpclient.o src/conn-tools/s6-tcpclient.lo: src/conn-tools/s6- src/conn-tools/s6-tcpserver-access.o src/conn-tools/s6-tcpserver-access.lo: src/conn-tools/s6-tcpserver-access.c src/include/s6-networking/s6net.h src/conn-tools/s6-tcpserver.o src/conn-tools/s6-tcpserver.lo: src/conn-tools/s6-tcpserver.c src/include/s6-networking/config.h src/conn-tools/s6-tcpserver4-socketbinder.o src/conn-tools/s6-tcpserver4-socketbinder.lo: src/conn-tools/s6-tcpserver4-socketbinder.c -src/conn-tools/s6-tcpserver4.o src/conn-tools/s6-tcpserver4.lo: src/conn-tools/s6-tcpserver4.c +src/conn-tools/s6-tcpserver4.o src/conn-tools/s6-tcpserver4.lo: src/conn-tools/s6-tcpserver4.c src/include/s6-networking/config.h src/conn-tools/s6-tcpserver4d.o src/conn-tools/s6-tcpserver4d.lo: src/conn-tools/s6-tcpserver4d.c src/conn-tools/s6-tcpserver6-socketbinder.o src/conn-tools/s6-tcpserver6-socketbinder.lo: src/conn-tools/s6-tcpserver6-socketbinder.c -src/conn-tools/s6-tcpserver6.o src/conn-tools/s6-tcpserver6.lo: src/conn-tools/s6-tcpserver6.c +src/conn-tools/s6-tcpserver6.o src/conn-tools/s6-tcpserver6.lo: src/conn-tools/s6-tcpserver6.c src/include/s6-networking/config.h src/conn-tools/s6-tcpserver6d.o src/conn-tools/s6-tcpserver6d.lo: src/conn-tools/s6-tcpserver6d.c src/conn-tools/seekablepipe.o src/conn-tools/seekablepipe.lo: src/conn-tools/seekablepipe.c src/libs6net/s6net_accessrules_backend_cdb.o src/libs6net/s6net_accessrules_backend_cdb.lo: src/libs6net/s6net_accessrules_backend_cdb.c src/include/s6-networking/accessrules.h @@ -46,6 +46,7 @@ src/libs6net/s6net_ident_reply_get.o src/libs6net/s6net_ident_reply_get.lo: src/ src/libs6net/s6net_ident_reply_parse.o src/libs6net/s6net_ident_reply_parse.lo: src/libs6net/s6net_ident_reply_parse.c src/include/s6-networking/ident.h src/minidentd/mgetuid-default.o src/minidentd/mgetuid-default.lo: src/minidentd/mgetuid-default.c src/minidentd/mgetuid.h src/minidentd/mgetuid-linux.o src/minidentd/mgetuid-linux.lo: src/minidentd/mgetuid-linux.c src/minidentd/mgetuid.h +src/minidentd/mgetuid.o src/minidentd/mgetuid.lo: src/minidentd/mgetuid.c src/minidentd/mgetuid.h src/minidentd/minidentd.o src/minidentd/minidentd.lo: src/minidentd/minidentd.c src/minidentd/mgetuid.h s6-clockadd: private EXTRA_LIBS := ${SYSCLOCK_LIB} @@ -59,7 +60,7 @@ s6-taiclock: src/clock/s6-taiclock.o -lskarnet s6-taiclockd: private EXTRA_LIBS := ${SOCKET_LIB} ${SYSCLOCK_LIB} s6-taiclockd: src/clock/s6-taiclockd.o -lskarnet s6-accessrules-cdb-from-fs: private EXTRA_LIBS := ${SOCKET_LIB} ${TAINNOW_LIB} -s6-accessrules-cdb-from-fs: src/conn-tools/s6-accessrules-cdb-from-fs.o -ls6net -lskarnet +s6-accessrules-cdb-from-fs: src/conn-tools/s6-accessrules-cdb-from-fs.o ${LIBS6NET} -lskarnet s6-accessrules-fs-from-cdb: private EXTRA_LIBS := s6-accessrules-fs-from-cdb: src/conn-tools/s6-accessrules-fs-from-cdb.o -lskarnet s6-connlimit: private EXTRA_LIBS := @@ -67,7 +68,7 @@ s6-connlimit: src/conn-tools/s6-connlimit.o -lskarnet s6-getservbyname: private EXTRA_LIBS := ${SOCKET_LIB} s6-getservbyname: src/conn-tools/s6-getservbyname.o -lskarnet s6-ident-client: private EXTRA_LIBS := ${SOCKET_LIB} ${TAINNOW_LIB} -s6-ident-client: src/conn-tools/s6-ident-client.o -ls6net -lskarnet +s6-ident-client: src/conn-tools/s6-ident-client.o ${LIBS6NET} -lskarnet s6-ioconnect: private EXTRA_LIBS := ${SOCKET_LIB} ${TAINNOW_LIB} s6-ioconnect: src/conn-tools/s6-ioconnect.o -lskarnet s6-ipcclient: private EXTRA_LIBS := ${SOCKET_LIB} @@ -75,7 +76,7 @@ s6-ipcclient: src/conn-tools/s6-ipcclient.o -lskarnet s6-ipcserver: private EXTRA_LIBS := s6-ipcserver: src/conn-tools/s6-ipcserver.o -lskarnet s6-ipcserver-access: private EXTRA_LIBS := ${SOCKET_LIB} -s6-ipcserver-access: src/conn-tools/s6-ipcserver-access.o -ls6net -lskarnet +s6-ipcserver-access: src/conn-tools/s6-ipcserver-access.o ${LIBS6NET} -lskarnet s6-ipcserver-socketbinder: private EXTRA_LIBS := ${SOCKET_LIB} s6-ipcserver-socketbinder: src/conn-tools/s6-ipcserver-socketbinder.o -lskarnet s6-ipcserverd: private EXTRA_LIBS := ${SOCKET_LIB} @@ -87,11 +88,11 @@ s6-sudoc: src/conn-tools/s6-sudoc.o -lskarnet s6-sudod: private EXTRA_LIBS := ${SOCKET_LIB} ${TAINNOW_LIB} s6-sudod: src/conn-tools/s6-sudod.o -lskarnet s6-tcpclient: private EXTRA_LIBS := ${SOCKET_LIB} ${TAINNOW_LIB} -s6-tcpclient: src/conn-tools/s6-tcpclient.o -ls6net -ls6dns -lskarnet +s6-tcpclient: src/conn-tools/s6-tcpclient.o ${LIBS6NET} -ls6dns -lskarnet s6-tcpserver: private EXTRA_LIBS := s6-tcpserver: src/conn-tools/s6-tcpserver.o -lskarnet s6-tcpserver-access: private EXTRA_LIBS := ${SOCKET_LIB} ${TAINNOW_LIB} -s6-tcpserver-access: src/conn-tools/s6-tcpserver-access.o -ls6net -ls6dns -lskarnet +s6-tcpserver-access: src/conn-tools/s6-tcpserver-access.o ${LIBS6NET} -ls6dns -lskarnet s6-tcpserver4: private EXTRA_LIBS := ${SOCKET_LIB} s6-tcpserver4: src/conn-tools/s6-tcpserver4.o -lskarnet s6-tcpserver4-socketbinder: private EXTRA_LIBS := ${SOCKET_LIB} diff --git a/package/info b/package/info index 3900515..8533b1c 100644 --- a/package/info +++ b/package/info @@ -1,4 +1,4 @@ package=s6-networking -version=2.0.0.1 +version=2.0.1.0 category=net package_macro_name=S6_NETWORKING diff --git a/package/targets.mak b/package/targets.mak index 1267a93..66b61be 100644 --- a/package/targets.mak +++ b/package/targets.mak @@ -32,6 +32,12 @@ minidentd LIBEXEC_TARGETS := +ifdef DO_ALLSTATIC +LIBS6NET := libs6net.a +else +LIBS6NET := libs6net.so +endif + ifdef DO_SHARED SHARED_LIBS := libs6net.so endif diff --git a/src/conn-tools/deps-exe/s6-accessrules-cdb-from-fs b/src/conn-tools/deps-exe/s6-accessrules-cdb-from-fs index 7229c44..407cc2d 100644 --- a/src/conn-tools/deps-exe/s6-accessrules-cdb-from-fs +++ b/src/conn-tools/deps-exe/s6-accessrules-cdb-from-fs @@ -1,4 +1,4 @@ --ls6net +${LIBS6NET} -lskarnet ${SOCKET_LIB} ${TAINNOW_LIB} diff --git a/src/conn-tools/deps-exe/s6-ident-client b/src/conn-tools/deps-exe/s6-ident-client index 7229c44..407cc2d 100644 --- a/src/conn-tools/deps-exe/s6-ident-client +++ b/src/conn-tools/deps-exe/s6-ident-client @@ -1,4 +1,4 @@ --ls6net +${LIBS6NET} -lskarnet ${SOCKET_LIB} ${TAINNOW_LIB} diff --git a/src/conn-tools/deps-exe/s6-ipcserver-access b/src/conn-tools/deps-exe/s6-ipcserver-access index 762de84..f328786 100644 --- a/src/conn-tools/deps-exe/s6-ipcserver-access +++ b/src/conn-tools/deps-exe/s6-ipcserver-access @@ -1,3 +1,3 @@ --ls6net +${LIBS6NET} -lskarnet ${SOCKET_LIB} diff --git a/src/conn-tools/deps-exe/s6-tcpclient b/src/conn-tools/deps-exe/s6-tcpclient index 13ea615..661b207 100644 --- a/src/conn-tools/deps-exe/s6-tcpclient +++ b/src/conn-tools/deps-exe/s6-tcpclient @@ -1,4 +1,4 @@ --ls6net +${LIBS6NET} -ls6dns -lskarnet ${SOCKET_LIB} diff --git a/src/conn-tools/deps-exe/s6-tcpserver-access b/src/conn-tools/deps-exe/s6-tcpserver-access index 13ea615..661b207 100644 --- a/src/conn-tools/deps-exe/s6-tcpserver-access +++ b/src/conn-tools/deps-exe/s6-tcpserver-access @@ -1,4 +1,4 @@ --ls6net +${LIBS6NET} -ls6dns -lskarnet ${SOCKET_LIB} diff --git a/tools/gen-deps.sh b/tools/gen-deps.sh index 5824dd6..2f7c57d 100755 --- a/tools/gen-deps.sh +++ b/tools/gen-deps.sh @@ -71,7 +71,7 @@ for dir in $(ls -1 src | grep -v ^include) ; do if echo $dep | grep -q -- \\.o$ ; then dep="src/$dir/$dep" fi - if echo $dep | grep -q ^\\\$ ; then + if echo $dep | grep -q '^\${.*_LIB}' ; then libs="$libs $dep" else deps="$deps $dep" -- cgit v1.2.3