- Adds glib2, irssi, and libffi.

- Fixes signal handling wrt. build status files.
- Simplify tarball creation procedure.
- Forcibly remove all \*.la files from $PREFIX_LVL3/lib
  after each installation build step.

1 files changed, 18 insertions, 1 deletions

diff --git a/build.vars b/build.vars
index 91147d5c..5bb21214 100644
--- a/build.vars
+++ b/build.vars
@@ -41,7 +41,7 @@ export PATH="${PREFIX}/bin${PATH:+:${PATH}}";
 : ${WGET_ARGS:="-N --no-check-certificate"};
 : ${WORKDIR:=${PREFIX}/tmp};
 
-: ${PKG_BUILD_NAMES:="apk_tools bash binutils binutils_host bzip2 coreutils dalist dash diffutils findutils gawk git gmp grep gzip hexcurse less libelf libressl libz make mpc mpfr nano ncurses ncursestw ncursesw ntapi ntcon ntctty openssh patch pemagine popt psxscl psxstub psxtypes rsync sed tar util_linux which xz"};
+: ${PKG_BUILD_NAMES:="apk_tools bash binutils binutils_host bzip2 coreutils dalist dash diffutils findutils gawk git glib gmp grep gzip hexcurse irssi less libelf libffi libressl libz make mpc mpfr nano ncurses ncursestw ncursesw ntapi ntcon ntctty openssh patch pemagine popt psxscl psxstub psxtypes rsync sed tar util_linux which xz"};
 : ${PKG_BUILD_VARS:="AR_BUILD AR_CONFIGURE BUILD_DIR BUILD_TYPE CC_BUILD CC_CONFIGURE CC_INSTALL CFLAGS_BUILD_EXTRA CFLAGS_CONFIGURE CFLAGS_CONFIGURE_EXTRA CFLAGS_INSTALL_EXTRA CONFIGURE_ARGS CONFIGURE_ARGS_EXTRA ENV_VARS_EXTRA GIT_ARGS_EXTRA INSTALL_TARGET LDFLAGS_BUILD_EXTRA LDFLAGS_CONFIGURE LDFLAGS_CONFIGURE_EXTRA LDFLAGS_INSTALL_EXTRA LIBTOOL_MIDIPIX LIBTOOL_MIDIPIX_FIX MAKEFLAGS_BUILD MAKEFLAGS_BUILD_EXTRA MAKEFLAGS_INSTALL MAKEFLAGS_INSTALL_EXTRA NO_CLEAN PATCHES_EXTRA_URL PREFIX_EXTRA RANLIB_INSTALL SHA256SUM SUBDIR URL URL_TYPE VERSION"};
 : ${PKG_LVL0_CFLAGS_CONFIGURE:=-O0};
 : ${PKG_LVL0_CONFIGURE_ARGS:="-C --host=${HOST_NATIVE} --prefix= --target=${TARGET}"};
@@ -123,6 +123,12 @@ export PATH="${PREFIX}/bin${PATH:+:${PATH}}";
 : ${PKG_GIT_SUBDIR:=git};
 : ${PKG_GIT_URL:=https://github.com/git/git.git};
 : ${PKG_GIT_URL_TYPE:=git};
+: ${PKG_GLIB_VERSION:=2.46.2};
+: ${PKG_GLIB_SHA256SUM:=5031722e37036719c1a09163cc6cf7c326e4c4f1f1e074b433c156862bd733db};
+: ${PKG_GLIB_URL:=http://ftp.gnome.org/pub/GNOME/sources/glib/${PKG_GLIB_VERSION%.[0-9]}/glib-${PKG_GLIB_VERSION}.tar.xz};
+: ${PKG_GLIB_CONFIGURE_ARGS_EXTRA:=--with-pcre=internal --disable-libelf};
+: ${PKG_GLIB_ENV_VARS_EXTRA:=LIBFFI_CFLAGS=-I${PREFIX_LVL3}/lib/libffi-3.2.1/include,LIBFFI_LIBS=-L${PREFIX_LVL3}/lib -lffi};
+: ${PKG_GLIB_MAKEFLAGS_BUILD_EXTRA:=V=99};
 : ${PKG_GMP_VERSION:=5.1.3};
 : ${PKG_GMP_SHA256SUM:=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160};
 : ${PKG_GMP_URL:=https://gmplib.org/download/gmp/gmp-${PKG_GMP_VERSION}.tar.bz2};
@@ -140,6 +146,13 @@ export PATH="${PREFIX}/bin${PATH:+:${PATH}}";
 : ${PKG_HEXCURSE_CFLAGS_CONFIGURE_EXTRA:=-I${PREFIX_LVL3}/include/ncursesw};
 : ${PKG_HEXCURSE_URL:=https://github.com/LonnyGomes/hexcurse};
 : ${PKG_HEXCURSE_URL_TYPE:=git};
+: ${PKG_IRSSI_VERSION=0.8.18};
+: ${PKG_IRSSI_SHA256SUM:=30043784815bb864b1bb66a82c1e659c325be0a18ddcf76fc101812e36c39c20};
+: ${PKG_IRSSI_URL:=https://github.com/irssi/irssi/releases/download/0.8.18/irssi-0.8.18.tar.gz};
+: ${PKG_IRSSI_CFLAGS_CONFIGURE_EXTRA:="-I${PREFIX_LVL3}/include/glib-2.0 -I${PREFIX_LVL3}/include/glib-2.0/include -I${PREFIX_LVL3}/lib/glib-2.0/include"};
+: ${PKG_IRSSI_ENV_VARS_EXTRA:=PKG_CONFIG_PATH=${PREFIX_LVL3}/lib/pkgconfig};
+: ${PKG_IRSSI_LDFLAGS_CONFIGURE_EXTRA:="-L${PREFIX_LVL3}/lib -lglib-2.0"};
+: ${PKG_IRSSI_MAKEFLAGS_BUILD_EXTRA:=V=99};
 : ${PKG_LESS_VERSION:=481};
 : ${PKG_LESS_SHA256SUM:=3fa38f2cf5e9e040bb44fffaa6c76a84506e379e47f5a04686ab78102090dda5};
 : ${PKG_LESS_URL:=http://www.greenwoodsoftware.com/less/less-${PKG_LESS_VERSION}.tar.gz};
@@ -149,7 +162,11 @@ export PATH="${PREFIX}/bin${PATH:+:${PATH}}";
 : ${PKG_LIBELF_CC_CONFIGURE:=${HOST_NATIVE}-gcc};
 : ${PKG_LIBELF_CONFIGURE_ARGS:="--host=${HOST_NATIVE} --prefix=${PREFIX_LVL1} --target=${TARGET}"};
 : ${PKG_LIBELF_MAKEFLAGS_INSTALL:=};
+: ${PKG_LIBFFI_VERSION:=3.2.1};
+: ${PKG_LIBFFI_SHA256SUM:=d06ebb8e1d9a22d19e38d63fdb83954253f39bedc5d46232a05645685722ca37};
+: ${PKG_LIBFFI_URL=ftp://sourceware.org/pub/libffi/libffi-${PKG_LIBFFI_VERSION}.tar.gz};
 : ${PKG_LIBFFI_LIBTOOL_MIDIPIX:=1};
+: ${PKG_LIBFFI_CFLAGS_CONFIGURE_EXTRA:=-D_WIN64};
 : ${PKG_LIBRESSL_VERSION:=2.2.6};
 : ${PKG_LIBRESSL_SHA256SUM:=1ee19994cffd047d40f63ba149115dba18a681b0cc923beec301bf424b58d64f};
 : ${PKG_LIBRESSL_URL:=http://ftp.eu.openbsd.org/pub/OpenBSD/LibreSSL/libressl-${PKG_LIBRESSL_VERSION}.tar.gz};