aboutsummaryrefslogtreecommitdiff
path: root/common/hooks/pre-pkg/05-prepare-32bit.sh
diff options
context:
space:
mode:
Diffstat (limited to 'common/hooks/pre-pkg/05-prepare-32bit.sh')
-rw-r--r--common/hooks/pre-pkg/05-prepare-32bit.sh13
1 files changed, 1 insertions, 12 deletions
diff --git a/common/hooks/pre-pkg/05-prepare-32bit.sh b/common/hooks/pre-pkg/05-prepare-32bit.sh
index fd6fdf88217..c293222586f 100644
--- a/common/hooks/pre-pkg/05-prepare-32bit.sh
+++ b/common/hooks/pre-pkg/05-prepare-32bit.sh
@@ -19,10 +19,6 @@ hook() {
# This hook will only work when building for x86.
if [ "$XBPS_TARGET_MACHINE" != "i686" ]; then
return
- fi
- # Ignore noarch pkgs.
- if [ "${archs// /}" = "noarch" ]; then
- return
fi
if [ -z "$lib32mode" ]; then
# Library mode, copy only relevant files to new destdir.
@@ -88,7 +84,7 @@ hook() {
_deps="$(<${PKGDESTDIR}/rdeps)"
fi
for f in ${_deps}; do
- unset found pkgn pkgv _arch _shprovides
+ unset found pkgn pkgv _shprovides
pkgn="$($XBPS_UHELPER_CMD getpkgdepname $f)"
if [ -z "${pkgn}" ]; then
@@ -106,13 +102,6 @@ hook() {
printf "${pkgn}-32bit${pkgv} " >> ${destdir32}/rdeps
continue
fi
- # If dependency is noarch do not change it to 32bit.
- _arch=$($XBPS_QUERY_CMD -R --property=architecture "$f")
- if [ "${_arch}" = "noarch" ]; then
- echo " RDEP: $f -> ${pkgn}${pkgv} (noarch)"
- printf "${pkgn}${pkgv} " >> ${destdir32}/rdeps
- continue
- fi
# If dependency does not have "shlib-provides" do not
# change it to 32bit.
for x in ${subpackages}; do