From 6a602f0951c056ce4c4d7594e20505eee3d1aff7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lucio=20Andr=C3=A9s=20Illanes=20Albornoz=20=28arab=2C=20vx?=
 =?UTF-8?q?p=29?= <lucio@lucioillanes.de>
Date: Tue, 15 May 2018 19:35:50 +0000
Subject: vars/build.vars:minipix: replaces curl_minipix w/ wget_minipix.
 vars/build.vars:minipix: removes duplicated library dependencies.
 vars/dist_minipix_dist.vars: copy
 lib{crypto.so.43,ssl.so.45,unistring.so.2,uuid.so.1} instead of libcurl.so.0.

---
 vars/build.vars             | 9 ++++-----
 vars/dist_minipix_dist.vars | 6 +++---
 2 files changed, 7 insertions(+), 8 deletions(-)

(limited to 'vars')

diff --git a/vars/build.vars b/vars/build.vars
index 9a668848..42aa77d4 100644
--- a/vars/build.vars
+++ b/vars/build.vars
@@ -1250,10 +1250,10 @@ MINIPIX_LDFLAGS_CONFIGURE="--sysroot=${PREFIX_NATIVE} -mvrfs";
 MINIPIX_LDFLAGS_BUILD="--sysroot=${PREFIX_NATIVE} -mvrfs";
 MINIPIX_MAKEFLAGS_INSTALL="PREFIX= prefix=";
 MINIPIX_PACKAGES="
-bzip2_minipix gzip_minipix pcre_minipix xz_minipix
-bash_minipix coreutils_minipix curl_minipix dash_minipix diffutils_minipix findutils_minipix gawk_minipix grep_minipix less_minipix nano_minipix patch_minipix sed_minipix tar_minipix vim_minipix which_minipix
+bzip2_minipix gzip_minipix xz_minipix
+bash_minipix coreutils_minipix dash_minipix diffutils_minipix findutils_minipix gawk_minipix grep_minipix less_minipix nano_minipix patch_minipix sed_minipix tar_minipix vim_minipix wget_minipix which_minipix
 mintty_minipix ntctty_minipix perk_minipix ptycon_minipix";
-MINIPIX_PARALLELISE=1;
+MINIPIX_PARALLELISE=0;
 MINIPIX_PREFIX="${PREFIX}/minipix_dist";
 
 #
@@ -1265,7 +1265,6 @@ MINIPIX_PREFIX="${PREFIX}/minipix_dist";
 : ${PKG_GZIP_MINIPIX_INHERIT_FROM:=gzip};
 : ${PKG_GZIP_MINIPIX_INSTALL_TARGET:=install-binPROGRAMS};
 : ${PKG_GZIP_MINIPIX_MAKEFLAGS_INSTALL_EXTRA:="OBJA="};
-: ${PKG_PCRE_MINIPIX_INHERIT_FROM:=pcre};
 : ${PKG_XZ_MINIPIX_INHERIT_FROM:=xz};
 
 #
@@ -1276,7 +1275,6 @@ MINIPIX_PREFIX="${PREFIX}/minipix_dist";
 : ${PKG_COREUTILS_MINIPIX_INHERIT_FROM:=coreutils};
 : ${PKG_COREUTILS_MINIPIX_INSTALL_TARGET:=install-binPROGRAMS};
 : ${PKG_COREUTILS_MINIPIX_MAKEFLAGS_INSTALL_EXTRA:=INSTALL_PROGRAM=${DEFAULT_TARGET}-install-strip};
-: ${PKG_CURL_MINIPIX_INHERIT_FROM:=curl};
 : ${PKG_DASH_MINIPIX_INHERIT_FROM:=dash};
 : ${PKG_DASH_MINIPIX_INSTALL_FILES:=bin/dash=bin/sh};
 : ${PKG_DIFFUTILS_MINIPIX_INHERIT_FROM:=diffutils};
@@ -1290,6 +1288,7 @@ MINIPIX_PREFIX="${PREFIX}/minipix_dist";
 : ${PKG_TAR_MINIPIX_INHERIT_FROM:=tar};
 : ${PKG_TAR_MINIPIX_MAKEFLAGS_INSTALL:="-C src install-binPROGRAMS"};
 : ${PKG_VIM_MINIPIX_INHERIT_FROM:=vim};
+: ${PKG_WGET_MINIPIX_INHERIT_FROM:=wget};
 : ${PKG_WHICH_MINIPIX_INHERIT_FROM:=which};
 
 #
diff --git a/vars/dist_minipix_dist.vars b/vars/dist_minipix_dist.vars
index 478158d8..5d898328 100644
--- a/vars/dist_minipix_dist.vars
+++ b/vars/dist_minipix_dist.vars
@@ -11,15 +11,15 @@ 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 libcurl.so.0 liblzma.so.5 libmagic.so.1		\
+	for _lib_name in libc.so libcrypto.so.43 liblzma.so.5 libmagic.so.1		\
 			libncursesw.so.6 libpcre.so.1 libpsxscl.so libu16ports.so.0	\
-			libz.so.1; do
+			libssl.so.45 libunistring.so.2 libuuid.so.1 libz.so.1; do
 		ex_rtl_fileop cp_follow							\
 			"${PREFIX_NATIVE}/lib/${_lib_name}" "${_dist_pfx}/bin";
 	done;
 	for _shared_pname in nano vim; do
 		ex_rtl_fileop cp_follow							\
-			"${PREFIX_NATIVE}/share/${_shared_pname}" "${_dist_pfx}/share";
+			"${PREFIX}/minipix_dist/share/${_shared_pname}" "${_dist_pfx}/share";
 	done;
 	ex_rtl_fileop ln_symbolic "nano/nanorc.nanorc" "${_dist_pfx}/share/nanorc";
 	ex_rtl_fileop ln_symbolic "vim/vim74/vimrc_example.vim" "${_dist_pfx}/share/vimrc";
-- 
cgit v1.2.3