From 5637a61beeaea85651a2790fb2bcff6fff2e0ebd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lucio=20Andr=C3=A9s=20Illanes=20Albornoz?= Date: Sun, 3 Sep 2017 20:05:55 +0200 Subject: vars/build.vars: adds libcaca (HEAD) and toilet (HEAD) (via Redfoxmoon.) patches/{libcaca,toilet}.local.patch: via Redfoxmoon. vars/{libcaca,toilet}.vars: force config.sub. --- vars/build.vars | 10 ++++++++-- vars/libcaca.vars | 21 +++++++++++++++++++++ vars/toilet.vars | 1 + 3 files changed, 30 insertions(+), 2 deletions(-) create mode 100644 vars/libcaca.vars create mode 120000 vars/toilet.vars (limited to 'vars') diff --git a/vars/build.vars b/vars/build.vars index d76486ce..0c8a2ca6 100644 --- a/vars/build.vars +++ b/vars/build.vars @@ -254,7 +254,7 @@ LIB_PACKAGES_LDFLAGS_CONFIGURE="--sysroot=${PREFIX_NATIVE}"; LIB_PACKAGES_MAKEFLAGS_INSTALL="DESTDIR=${PREFIX_NATIVE}"; LIB_PACKAGES_PACKAGES_LEAVES=" expat libxml2 apr apr_util bzip2 curl libz libpng libffi gdbm geoip pcre glib gzip libarchive -libatomic_ops libpipeline libressl libevent libfetch libgpg_error libassuan libfirm libgcrypt +libatomic_ops libpipeline libressl libevent libfetch libgpg_error libassuan libcaca libfirm libgcrypt libjpeg_turbo libksba lua ncurses ncursestw ncursesw npth sqlite3 tiff xz"; LIB_PACKAGES_PACKAGES_X11=" inputproto kbproto xcb_proto xproto libXau libpthread_stubs xcb xextproto xtrans libX11 @@ -360,6 +360,8 @@ LIB_PACKAGES_PREFIX="${PREFIX_NATIVE}"; : ${PKG_LIBASSUAN_SHA256SUM:=22843a3bdb256f59be49842abf24da76700354293a066d82ade8134bb5aa2b71}; : ${PKG_LIBASSUAN_VERSION:=2.4.3}; : ${PKG_LIBASSUAN_URL:=https://www.gnupg.org/ftp/gcrypt/libassuan/libassuan-${PKG_LIBASSUAN_VERSION}.tar.bz2}; +: ${PKG_LIBCACA_URLS_GIT:=libcaca=https://github.com/cacalabs/libcaca@master}; +: ${PKG_LIBCACA_SUBDIR:=libcaca}; : ${PKG_LIBFIRM_URLS_GIT:="libfirm=http://pp.info.uni-karlsruhe.de/git/libfirm.git@master bfirm=${GITROOT}/compilers/bfirm@main"}; : ${PKG_LIBFIRM_BUILD_DIR:=cparser+libfirm/build/libfirm}; : ${PKG_LIBFIRM_CONFIGURE:=bfirm/configure}; @@ -541,7 +543,7 @@ apk_tools bash bc bdwgc bind bison chicken clang_host coreutils cparser cron das dos2unix dropbear ed figlet file findutils gawk git gnupg grep hexcurse htop inetutils infounzip infozip irssi john ldns less lighttpd lynx make man_db mc mksh mtr nano netcat nginx openlitespeed openssh p7zip pacman patch perl procps_ng python3 qpdf rsync rxvt_unicode sed smallbasic socat tar tcsh the_silver_searcher -tmux util_linux vim weechat wget which whois xeyes xwd zsh"; +tmux toilet util_linux vim weechat wget which whois xeyes xwd zsh"; if [ -n "$(which ruby 2>/dev/null)" ]; then LEAF_PACKAGES_PACKAGES="${LEAF_PACKAGES_PACKAGES:+${LEAF_PACKAGES_PACKAGES} }ruby"; fi; @@ -855,6 +857,10 @@ fi; : ${PKG_TMUX_SHA256SUM:=55313e132f0f42de7e020bf6323a1939ee02ab79c48634aa07475db41573852b}; : ${PKG_TMUX_VERSION:=2.3}; : ${PKG_TMUX_URL:=https://github.com/tmux/tmux/releases/download/${PKG_TMUX_VERSION}/tmux-${PKG_TMUX_VERSION}.tar.gz}; +: ${PKG_TOILET_URLS_GIT:=toilet=https://github.com/cacalabs/toilet@master}; +: ${PKG_TOILET_SUBDIR:=toilet}; +: ${PKG_TOILET_ENV_VARS_EXTRA:="CACA_LIBS=-L${PREFIX_NATIVE}/lib -lcaca"}; +: ${PKG_TOILET_CONFIGURE_ARGS_EXTRA:=--program-prefix=""}; : ${PKG_UTIL_LINUX_SHA256SUM:=21ede7eb6c3a2a9c7b13eeee241e82428be4f6d5030ff488f638817f419af093}; : ${PKG_UTIL_LINUX_VERSION:=2.27}; : ${PKG_UTIL_LINUX_URL:=https://www.kernel.org/pub/linux/utils/util-linux/v${PKG_UTIL_LINUX_VERSION}/util-linux-${PKG_UTIL_LINUX_VERSION}.tar.gz}; diff --git a/vars/libcaca.vars b/vars/libcaca.vars new file mode 100644 index 00000000..b9d77ac4 --- /dev/null +++ b/vars/libcaca.vars @@ -0,0 +1,21 @@ +# +# set -o errexit -o noglob are assumed. +# + +pkg_libcaca_configure_pre() { + find "${WORKDIR}/${PKG_SUBDIR}" -name config.sub \ + -exec echo mv -- {} {}.orig \; \ + -exec mv -- {} {}.orig \; \ + -exec echo install -m 0700 "${MIDIPIX_BUILD_PWD}/etc/config.sub" {} \; \ + -exec install -m 0700 "${MIDIPIX_BUILD_PWD}/etc/config.sub" {} \;; +}; + +pkg_toilet_configure_pre() { + find "${WORKDIR}/${PKG_SUBDIR}" -name config.sub \ + -exec echo mv -- {} {}.orig \; \ + -exec mv -- {} {}.orig \; \ + -exec echo install -m 0700 "${MIDIPIX_BUILD_PWD}/etc/config.sub" {} \; \ + -exec install -m 0700 "${MIDIPIX_BUILD_PWD}/etc/config.sub" {} \;; +}; + +# vim:filetype=sh diff --git a/vars/toilet.vars b/vars/toilet.vars new file mode 120000 index 00000000..758040c3 --- /dev/null +++ b/vars/toilet.vars @@ -0,0 +1 @@ +libcaca.vars \ No newline at end of file -- cgit v1.2.3