dot

commit 53d820b5c5ea28f684ea47d0c581229910651a30
parent 5896a2880c8fcb2ca02e70eef40d18b99b68dca6
Author: Josuah Demangeon <mail@josuah.net>
Date:   Mon,  6 Aug 2018 22:22:46 +0200

pack: update build recipes

Diffstat:
M
pack/farbfeld/config.mk
 | 
2
+-
M
pack/farbfeld/dep
 | 
2
++
M
pack/lel/build
 | 
2
+-
M
pack/libpng/tar
 | 
2
+-
M
pack/libpng/version
 | 
1
+
M
pack/s6-networking/build
 | 
9
++++++---
M
pack/s6-networking/dep
 | 
1
+
M
pack/s6/build
 | 
1
+
M
pack/sacc/build
 | 
2
+-

9 files changed, 15 insertions(+), 7 deletions(-)
diff --git a/pack/farbfeld/config.mk b/pack/farbfeld/config.mk
@@ -12,7 +12,7 @@ CPPFLAGS = -D_DEFAULT_SOURCE
 CFLAGS = -std=c99 -pedantic -Wall -Wextra -Os \
 	-I/opt/libpng/cur/include \
 	-I/opt/libjpeg/cur/include
-LDFLAGS  = -s -static \
+LDFLAGS  = -s \
 	-L/opt/libjpeg/cur/lib \
 	-L/opt/libpng/cur/lib
 PNG-LDFLAGS = -lpng
diff --git a/pack/farbfeld/dep b/pack/farbfeld/dep
@@ -1 +1,3 @@
 gmake
+libpng
+libjpeg
diff --git a/pack/lel/build b/pack/lel/build
@@ -1,3 +1,3 @@
 #!/bin/sh -ex
 
-make prefix="$PREFIX" install
+make PREFIX="$PREFIX" install
diff --git a/pack/libpng/tar b/pack/libpng/tar
@@ -1 +1 @@
-ftp://ftp-osl.osuosl.org/pub/libpng/src/libpng16/libpng-%s.tar.xz
+https://download.sourceforge.net/libpng/libpng-%s.tar.xz
diff --git a/pack/libpng/version b/pack/libpng/version
@@ -1 +1,2 @@
 1.6.34
+1.6.35
diff --git a/pack/s6-networking/build b/pack/s6-networking/build
@@ -5,9 +5,12 @@
 	--with-sysdeps=/opt/libskarnet/cur/lib/skalibs/sysdeps \
 	--with-include=/opt/libskarnet/cur/include \
 	--with-lib=/opt/libskarnet/cur/lib/skalibs \
-	--with-lib=/opt/libskarnet/cur/lib/execline \
-	--with-lib=/opt/libskarnet/cur/lib/s6 \
-	--with-lib=/opt/libskarnet/cur/lib/s6-dns \
+	--with-include=/opt/execline/cur/include \
+	--with-lib=/opt/execline/cur/lib/execline \
+	--with-include=/opt/s6/cur/include \
+	--with-lib=/opt/s6/cur/lib/s6 \
+	--with-include=/opt/s6-dns/cur/include \
+	--with-lib=/opt/s6-dns/cur/lib/s6-dns \
 	--enable-ssl=bearssl \
 	--with-ssl-path=/opt/libbearssl/cur
 
diff --git a/pack/s6-networking/dep b/pack/s6-networking/dep
@@ -1,3 +1,4 @@
 gmake
 libskarnet
+libbearssl
 s6-dns
diff --git a/pack/s6/build b/pack/s6/build
@@ -5,6 +5,7 @@
 	--with-sysdeps=/opt/libskarnet/cur/lib/skalibs/sysdeps \
 	--with-include=/opt/libskarnet/cur/include \
 	--with-lib=/opt/libskarnet/cur/lib/skalibs \
+	--with-include=/opt/execline/cur/include \
 	--with-lib=/opt/execline/cur/lib/execline
 
 gmake install
diff --git a/pack/sacc/build b/pack/sacc/build
@@ -1,4 +1,4 @@
 #!/bin/sh -ex
 
 cp "$PACK/config.mk" ./config.mk
-make PREFIX="$PREIFX" install
+make PREFIX="$PREFIX" install