From 5372bbde810c713c5407dcd3a046e341e0a52219 Mon Sep 17 00:00:00 2001 From: Lucio Andrés Illanes Albornoz (arab, vxp) Date: May 10 2018 21:18:25 +0000 Subject: vars/build.vars:minipix: removes wget_minipix. vars/dist_minipix_dist.vars: copy libcurl.so.0. --- diff --git a/vars/build.vars b/vars/build.vars index 4d50b1e..60bb6c5 100644 --- a/vars/build.vars +++ b/vars/build.vars @@ -1197,7 +1197,7 @@ MINIPIX_LDFLAGS_CONFIGURE="--sysroot=${PREFIX_NATIVE}"; MINIPIX_MAKEFLAGS_INSTALL="PREFIX= prefix="; MINIPIX_PACKAGES=" bzip2_minipix gzip_minipix tar_minipix xz_minipix -bash_minipix coreutils_minipix curl_minipix dash_minipix diffutils_minipix findutils_minipix gawk_minipix less_minipix nano_minipix patch_minipix vim_minipix wget_minipix which_minipix +bash_minipix coreutils_minipix curl_minipix dash_minipix diffutils_minipix findutils_minipix gawk_minipix less_minipix nano_minipix patch_minipix vim_minipix which_minipix mintty_minipix ntctty_minipix perk_minipix ptycon_minipix"; MINIPIX_PARALLELISE=1; MINIPIX_PREFIX="${PREFIX}/minipix_dist"; @@ -1259,9 +1259,6 @@ MINIPIX_PREFIX="${PREFIX}/minipix_dist"; : ${PKG_VIM_MINIPIX_INHERIT_FROM:=vim}; : ${PKG_VIM_MINIPIX_BASE_DIR:=${BUILD_WORKDIR}/vim-build-minipix}; : ${PKG_VIM_MINIPIX_LDFLAGS_CONFIGURE_EXTRA:="-mvrfs"}; -: ${PKG_WGET_MINIPIX_INHERIT_FROM:=wget}; -: ${PKG_WGET_MINIPIX_BASE_DIR:=${BUILD_WORKDIR}/wget-build-minipix}; -: ${PKG_WGET_MINIPIX_LDFLAGS_CONFIGURE_EXTRA:="-mvrfs"}; : ${PKG_WHICH_MINIPIX_INHERIT_FROM:=which}; : ${PKG_WHICH_MINIPIX_BASE_DIR:=${BUILD_WORKDIR}/which-build-minipix}; : ${PKG_WHICH_MINIPIX_LDFLAGS_CONFIGURE_EXTRA:="-mvrfs"}; diff --git a/vars/dist_minipix_dist.vars b/vars/dist_minipix_dist.vars index 95a35bb..a9c5a57 100644 --- a/vars/dist_minipix_dist.vars +++ b/vars/dist_minipix_dist.vars @@ -11,7 +11,8 @@ pkg_dist_minipix_dist_all() { -maxdepth 1 -perm /a=x -type f -and \( -not -name "lib*" \)); do ex_rtl_fileop cp_follow "${_bin_pname}" "${_dist_pfx}/bin"; done; - for _lib_name in libc.so liblzma.so.5 libmagic.so.1 libncursesw.so.6 libpsxscl.so libu16ports.so.0 libz.so.1; do + for _lib_name in libc.so libcurl.so.0 liblzma.so.5 libmagic.so.1 \ + libncursesw.so.6 libpsxscl.so libu16ports.so.0 libz.so.1; do ex_rtl_fileop cp_follow \ "${PREFIX_NATIVE}/lib/${_lib_name}" "${_dist_pfx}/bin"; done;