dot

packages and services management
Log | Files | Refs | README

commit 77596fdcbd59def0da0ee66e84877a94b54b19fe
parent 774ba48173f44c2bfdf389cab4be138dd7e9c708
Author: Josuah Demangeon <mail@josuah.net>
Date:   Tue,  3 Jul 2018 00:10:22 +0200

Merge branch 'master' of /home/git/conf

Diffstat:
Mpack/dwm/config.h | 2+-
Apack/enchive/build | 3+++
Mpack/farbfeld/build | 5++++-
Mpack/libgit2/build | 10+++++++---
Apack/libowfat/build | 3+++
Apack/man-linux/build | 3+++
Mpack/mpop/build | 4++--
Apack/redis/build | 3+++
Apack/rsync/build | 5+++++
Mpack/rsync/tar | 2+-
Apack/stagit-gopher/build | 5+++++
Mpack/stagit-gopher/config.mk | 4++--
Apack/stagit/build | 5+++++
Mpack/stagit/config.mk | 12++++++------
14 files changed, 50 insertions(+), 16 deletions(-)

diff --git a/pack/dwm/config.h b/pack/dwm/config.h @@ -84,7 +84,7 @@ static Key keys[] = { { MODKEY|ShiftMask, XK_Return, spawn, {.v = termcmd } }, { MODKEY, XK_o, spawn, {.v = opencmd } }, { MODKEY, XK_s, spawn, {.v = sessioncmd } }, - { MODKEY, XK_s, spawn, {.v = uricmd } }, + { MODKEY, XK_u, spawn, {.v = uricmd } }, { MODKEY, XK_p, spawn, {.v = plumbcmd } }, { MODKEY, XK_x, spawn, {.v = pstrcmd } }, { MODKEY, XK_b, togglebar, {0} }, diff --git a/pack/enchive/build b/pack/enchive/build @@ -0,0 +1,3 @@ +#!/bin/sh -ex + +make PREFIX="$PREFIX" install diff --git a/pack/farbfeld/build b/pack/farbfeld/build @@ -1,2 +1,5 @@ #!/bin/sh -ex -cp config.mk $SOURCE/config.mk + +cp "$PACK/config.mk" ./config.mk + +make PREFIX="$PREFIX" install diff --git a/pack/libgit2/build b/pack/libgit2/build @@ -5,10 +5,14 @@ rm -f "$SOURCE/src/hash/hash_generic.c" rm -f "$SOURCE/src/hash/hash_win32.c" rm -fR "$SOURCE/src/win32/" -cc -c -fPIC -I../include/ -I./ -I../deps/http-parser/ \ - *.c */*.c */*/*.c ../deps/http-parser/*.c +cd src + +cc -c -fPIC \ + -I./ -I"$DEST/include" -I../include/ -I../deps/http-parser/ \ + ./*.c ./*/*.c ./*/*/*.c ../deps/http-parser/*.c cc -shared -o libgit2.so *.o +ar -rcs libgit2.a *.o mkdir -p "$PREFIX/lib/" -cp libgit2.so "$PREFIX//lib/" +cp libgit2.so libgit2.a "$PREFIX//lib/" cp -R "$SOURCE/include/" "$PREFIX/" diff --git a/pack/libowfat/build b/pack/libowfat/build @@ -0,0 +1,3 @@ +#!/bin/sh -ex + +make PREFIX="$PREFIX" install diff --git a/pack/man-linux/build b/pack/man-linux/build @@ -0,0 +1,3 @@ +#!/bin/sh -e + +make PREFIX="$PREFIX" install diff --git a/pack/mpop/build b/pack/mpop/build @@ -1,7 +1,7 @@ #!/bin/sh -ex -export libssl_CFLAGS="-I'$PACK/include'" -export libssl_LIBS="-L'$PACK/lib' -lssl -lcrypto" +export libssl_CFLAGS="-I'$DEST/include'" +export libssl_LIBS="-static -L'$DEST/lib' -lssl -lcrypto" ./configure --prefix="$PREFIX" diff --git a/pack/redis/build b/pack/redis/build @@ -0,0 +1,3 @@ +#!/bin/sh -e + +make PREFIX="$PREFIX" install diff --git a/pack/rsync/build b/pack/rsync/build @@ -0,0 +1,5 @@ +#!/bin/sh -ex + +./configure --prefix="$PREFIX" + +make install diff --git a/pack/rsync/tar b/pack/rsync/tar @@ -1 +1 @@ -https://rsync.samba.org/ftp/rsync/rsync-3.1.2.tar.gz +https://download.samba.org/pub/rsync/rsync-3.1.3.tar.gz diff --git a/pack/stagit-gopher/build b/pack/stagit-gopher/build @@ -0,0 +1,5 @@ +#!/bin/sh -ex + +cp "$PACK/config.mk" ./ + +make PREFIX="$PREFIX" install diff --git a/pack/stagit-gopher/config.mk b/pack/stagit-gopher/config.mk @@ -7,8 +7,8 @@ MANPREFIX = ${PREFIX}/share/man # compiler and linker #CC = cc -GITINC = $(PACK)/include -GITLIB = $(PACK)/lib +GITINC = $(DEST)/include +GITLIB = $(DEST)/lib # includes and libs INCS = -I${GITINC} diff --git a/pack/stagit/build b/pack/stagit/build @@ -0,0 +1,5 @@ +#!/bin/sh -ex + +cp "$PACK/config.mk" ./ + +make PREFIX="$PREFIX" install diff --git a/pack/stagit/config.mk b/pack/stagit/config.mk @@ -7,8 +7,8 @@ MANPREFIX = ${PREFIX}/share/man # compiler and linker #CC = cc -GITINC = $(PACK)/include -GITLIB = $(PACK)/lib +GITINC = $(DEST)/include +GITLIB = $(DEST)/lib # includes and libs INCS = -I${GITINC} @@ -19,11 +19,11 @@ LIBS = -L${GITLIB} -lgit2 -lz -lssl -lpthread #LDFLAGS = ${LIBS} # optimized -CFLAGS = -O2 -std=c99 ${INCS} -LDFLAGS = -s ${LIBS} +#CFLAGS = -O2 -std=c99 ${INCS} +#LDFLAGS = -s ${LIBS} # optimized static -#CFLAGS = -static -O2 -std=c99 ${INCS} -#LDFLAGS = -static -s ${LIBS} +CFLAGS = -static -O2 -std=c99 ${INCS} +LDFLAGS = -static -s ${LIBS} CPPFLAGS = -D_XOPEN_SOURCE=700 -D_DEFAULT_SOURCE -D_BSD_SOURCE ${INCS}