From bf9edfaed49c4387e181be454602e0cc65fe4382 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lucio=20Andr=C3=A9s=20Illanes=20Albornoz?=
 <lucio@lucioillanes.de>
Date: Sun, 1 Mar 2020 21:09:37 +0000
Subject: General cleanup, pt. III.

dist/dist_digest.dist: removes obsolete dist file.
etc/{build.usage,README.md}: updated.
groups/000.host_tools.group:{autoconf,automake,gettext_tiny,install_strip,libtool,m4}_host: moved from groups/010.host_deps.group.
groups/221.native_packages_dev.group:lua: moved from groups/231.native_packages_etc.group.
groups/221.native_packages_dev.group:lua:${PKG_FORCE_AUTORECONF}: set.
groups/231.native_packages_etc.group:{mlogin,tdnf}:${PKG_FORCE_AUTORECONF}: set.
groups/241.native_packages_inet.group:nullmailer:${PKG_FORCE_AUTORECONF}: set.
groups/251.native_packages_lib.group:lib{asr,gpg_error}:${PKG_FORCE_AUTORECONF}: set.
midipix.env, etc/README.md, subr/pkg_configure_autotools.subr: adds FORCE_NO_AUTORECONF.
subr/rtl_fileop.subr: adds ch{mod,own} fileops.
vars/{check_updates,jamvm,lib{asr,gpg_error},lua,mlogin,tdnf}.vars: removes obsolete vars file.
---
 subr/pkg_install_libs.subr | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

(limited to 'subr/pkg_install_libs.subr')

diff --git a/subr/pkg_install_libs.subr b/subr/pkg_install_libs.subr
index a00f15bb..76c7bfdb 100644
--- a/subr/pkg_install_libs.subr
+++ b/subr/pkg_install_libs.subr
@@ -5,7 +5,9 @@
 pkgp_install_libs_purge_la() {
 	local _la_path="";
 	for _la_path in $(find "${PKG_DESTDIR}" -type f -name \*.la); do
-		rtl_fileop rm "${_la_path}" || return "${?}";
+		if ! rtl_fileop rm "${_la_path}"; then
+			return 1;
+		fi;
 	done;
 };
 
@@ -25,7 +27,7 @@ pkgp_install_libs_shared() {
 	local _lib_dst_path="" _lib_name="" _lib_src_path="" _so_dst_dir="" _so_src_path="";
 	if [ "${PKG_BUILD_TYPE}" != "host" ]; then
 		for _so_src_path in \
-			$(find	"${PKG_DESTDIR}"							  \
+			$(find	"${PKG_DESTDIR}"							  	\
 				\(  -name "*.so" -or -name "*.so.*" \) -print);
 		do	if [ "$(readlink -f "${_so_path}")" != "/dev/null" ]\
 			&& [ -z "$(rtl_head "[0-9.]" "${_so_src_path##*.so}")" ]; then
@@ -38,13 +40,17 @@ pkgp_install_libs_shared() {
 				_lib_dst_path="${_so_dst_dir}/${_lib_name}";
 				if [ ! -L "${_lib_src_path}" ]\
 				&& [ ! -e "${_lib_dst_path}" ]; then
-					(rtl_fileop cd "$(rtl_dirname "${_so_src_path}")" 	&&\
-					perk -e "$(rtl_basename "${_so_src_path}")"			 |\
-						"${PKG_TARGET}-mdso"					  \
-							-i "$(rtl_basename "${_lib_dst_path}")"	  \
-							-n "$(rtl_basename "${_so_src_path}")" -) || return "${?}";
+					if ! (rtl_fileop cd "$(rtl_dirname "${_so_src_path}")" 	&&		\
+							perk -e "$(rtl_basename "${_so_src_path}")"		|\
+								"${PKG_TARGET}-mdso"				\
+									-i "$(rtl_basename "${_lib_dst_path}")"	\
+									-n "$(rtl_basename "${_so_src_path}")" -); then
+						return 1;
+					fi;
+				fi;
+				if ! pkgp_install_libs_shared_link "${_lib_name}" "${_so_dst_dir}" "${_so_src_path}"; then
+					return 1;
 				fi;
-				pkgp_install_libs_shared_link "${_lib_name}" "${_so_dst_dir}" "${_so_src_path}" || return "${?}";
 			fi;
 		done;
 	fi;
-- 
cgit v1.2.3