dot

packages and services management
Log | Files | Refs | README

commit 05bf753956412155e68c0871f4fb0a46547be37b
parent cdb98da58eec162b6c743fd04dc80ce83706df93
Author: Josuah Demangeon <mail@josuah.net>
Date:   Tue, 20 Nov 2018 01:49:50 +0100

pack/vtun: fix build

Diffstat:
Mbin/service-enable | 21+++++++++++----------
Mpack/vtun/build | 27+++++++++++++++++++++++----
Tpack/vtun/dependencies/liblzo | 0
Apack/vtun/dependencies/libressl | 2++
Tpack/vtun/dependencies/libz | 0
Apack/vtun/dependencies/oyacc | 2++
6 files changed, 38 insertions(+), 14 deletions(-)

diff --git a/bin/service-enable b/bin/service-enable @@ -8,13 +8,20 @@ backtick x { dollarat -n -d : } importas name x export 1 x # check that all compounds are defined -if { forbacktickx -0 x { dollarat -0 } importas x x test -d /etc/s6/${1}/${x} } +if { forbacktickx -0 -o 0 x { dollarat -0 } importas x x + test -d /etc/s6/${1}/${x} +} # start from scratch if { service-disable $@ } +# add each part of the service +if { forbacktickx -0 -o 0 x { dollarat -0 } importas x x + s6-hiercopy /etc/s6/${1}/${x} ${name} +} + # setup the logger if it is a longrun service -ifthenelse { grep -qFx longrun /etc/s6/${1}/x/type } { +if { if -t { grep -qFx longrun /etc/s6/${1}/x/type } if { s6-hiercopy /etc/s6/.s6-rc/service-log ${name}:log } if { redirfd -a 1 ${name}/producer-for echo ${name}:log } if { redirfd -w 1 ${name}:log/consumer-for echo ${name} } @@ -24,12 +31,6 @@ ifthenelse { grep -qFx longrun /etc/s6/${1}/x/type } { # append this service to the default service bundle if { heredoc 0 "${name}\n" sort -u -o x/contents x/contents - } -# add each part of the service -if { - forbacktickx -0 x { dollarat -0 } importas x x - if { s6-hiercopy /etc/s6/${1}/${x} ${name} } - if { heredoc 0 "${name}\n" sort -u -o ${x}/contents ${x}/contents - } -} - # execute into the setup script if there is one -cd $name if -t { test -e setup } ./setup +cd $name +if -t { test -e setup } ./setup diff --git a/pack/vtun/build b/pack/vtun/build @@ -1,13 +1,32 @@ #!/bin/sh -e -export CFLAGS="-I$libz/include" -export LDFLAGS="-L$libz/lib" +export CFLAGS="$(echo \ + -I$libz/include \ + -I$liblzo/include \ + -I$libressl/include \ +)" + +export LDFLAGS="$(echo \ + -L$libz/lib \ + -L$liblzo/lib \ + -L$libressl/lib \ +)" ./configure \ --prefix="$PREFIX" \ - --with-ssl-headers="$libressl/include" \ --with-ssl-lib="$libressl/lib" \ --with-lzo-headers="$liblzo/include/lzo" \ - --with-lzo-lib="$liblzo/lib" + --with-lzo-lib="$liblzo/lib" \ + --with-ssl-headers="$libressl/include/openssl" \ + --with-blowfish-headers="$libressl/include/openssl" + +for f in *.[cyh]; do + sed 's/inline //' $f >$$ + mv $$ $f +done +grep -vF '$(BIN_DIR)/strip $(DESTDIR)$(SBIN_DIR)/vtund' Makefile >$$ +mv $$ Makefile make install + +mv "$PREFIX/sbin" "$PREFIX/bin" diff --git a/pack/vtun/dependencies/liblzo b/pack/vtun/dependencies/liblzo diff --git a/pack/vtun/dependencies/libressl b/pack/vtun/dependencies/libressl @@ -0,0 +1 @@ +../../libressl/version+ \ No newline at end of file diff --git a/pack/vtun/dependencies/libz b/pack/vtun/dependencies/libz diff --git a/pack/vtun/dependencies/oyacc b/pack/vtun/dependencies/oyacc @@ -0,0 +1 @@ +../../oyacc/version+ \ No newline at end of file