dot

packages and services management
Log | Files | Refs | README

commit 18dcff5cb5fad88449a13b5ff1819a70940b2b5d
parent 2119b1446f3184b18fd4c3dc88b77775349d14ee
Author: Josuah Demangeon <mail@josuah.net>
Date:   Wed, 29 Aug 2018 21:56:57 +0200

pack: fix dependencies

Diffstat:
Mbin/pack-add | 8++++----
Dhost/t470s/pack | 2--
Dhost/t470s/source/ftpd-log | 2--
Dhost/t470s/source/ftpd-run | 2--
Dhost/t470s/source/httpd-log | 2--
Dhost/t470s/source/httpd-run | 2--
Mpack/libpcap/1.8.1/dep | 1+
Mpack/reflex/20171231/dep | 1+
Mpack/tcpdump/4.9.1/dep | 1+
Mpack/yacc/git/build | 8++++++--
10 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/bin/pack-add b/bin/pack-add @@ -1,13 +1,13 @@ #!/bin/sh -e # build a program into /opt/<package>/<version> and symlink it into /local -set -- "$(readlink -f "/etc/pack/$1" | sed -r 's,.*/([^/]+/[^/]+)$,\1,')" +set -- "$(readlink -f "/etc/pack/$1" | sed -r 's,.*/(.+/.+)$,\1,')" test -f "/etc/pack/$1/dep" && xargs -n 1 pack-add </etc/pack/$1/dep test -d "/opt/$1" || pack-build "$1" || { rm -rf "/opt/$1"; exit 1; } printf '\033[1m[ installing %s ]\033[m\n' "$1" cd "/opt/$1" -ln -sf "/opt/$1" "/opt/cur" -set -- "$(dirname "$1")/cur" +ln -sf "$(basename "$1")" "/opt/cur" +set -- "$(dirname "$1")" mv -f "/opt/cur" "/opt/$1" find -L * -type d -exec sh -c 'mkdir -p "/local/$0"' {} \; -find -L * -type f -exec sh -c 'ln -sf "/opt/$1/$0" "/local/$0"' {} "$1" \; +find -L * -type f -exec sh -c 'ln -sf "/opt/$1/cur/$0" "/local/$0"' {} "$1" \; diff --git a/host/t470s/pack b/host/t470s/pack @@ -1,2 +0,0 @@ -s6-rc/cur -s6-portable-utils/cur diff --git a/host/t470s/source/ftpd-log b/host/t470s/source/ftpd-log @@ -1 +0,0 @@ -/etc/s6/ftpd-log- \ No newline at end of file diff --git a/host/t470s/source/ftpd-run b/host/t470s/source/ftpd-run @@ -1 +0,0 @@ -/etc/s6/ftpd-run- \ No newline at end of file diff --git a/host/t470s/source/httpd-log b/host/t470s/source/httpd-log @@ -1 +0,0 @@ -/etc/s6/httpd-log- \ No newline at end of file diff --git a/host/t470s/source/httpd-run b/host/t470s/source/httpd-run @@ -1 +0,0 @@ -/etc/s6/httpd-run- \ No newline at end of file diff --git a/pack/libpcap/1.8.1/dep b/pack/libpcap/1.8.1/dep @@ -1 +1,2 @@ gmake/cur +reflex/cur diff --git a/pack/reflex/20171231/dep b/pack/reflex/20171231/dep @@ -1 +1,2 @@ gmake/cur +yacc/cur diff --git a/pack/tcpdump/4.9.1/dep b/pack/tcpdump/4.9.1/dep @@ -1 +1,2 @@ gmake/cur +libpcap/cur diff --git a/pack/yacc/git/build b/pack/yacc/git/build @@ -1,4 +1,8 @@ #!/bin/sh -ex -./configure --prefix="$PREFIX" -make install +./configure +make \ + CFLAGS='-D__unused= -D__dead= -pipe -D_GNU_SOURCE -DNEED_REALLOCARRAY' \ + PREFIX="" \ + DESTDIR="$PREFIX" \ + install