aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorq66 <daniel@octaforge.org>2021-01-20 11:55:11 +0000
committerq66 <daniel@octaforge.org>2021-01-20 12:09:59 +0000
commitcb804fbf85db4bed610d0eed41d1812a0cb40016 (patch)
tree4e7ff5cfc6243c768bc66dd7e04639fb83d94ec5
parent06d3472acdf8ca2777415d2d9301b5dd97126d1a (diff)
downloadvoid-packages-cb804fbf85db4bed610d0eed41d1812a0cb40016.tar
void-packages-cb804fbf85db4bed610d0eed41d1812a0cb40016.tar.gz
void-packages-cb804fbf85db4bed610d0eed41d1812a0cb40016.tar.bz2
void-packages-cb804fbf85db4bed610d0eed41d1812a0cb40016.tar.lz
void-packages-cb804fbf85db4bed610d0eed41d1812a0cb40016.tar.xz
void-packages-cb804fbf85db4bed610d0eed41d1812a0cb40016.tar.zst
void-packages-cb804fbf85db4bed610d0eed41d1812a0cb40016.zip
xbps-src: remove noarch
-rw-r--r--Manual.md2
-rw-r--r--common/hooks/do-pkg/00-gen-pkg.sh6
-rw-r--r--common/hooks/post-install/06-strip-and-debug-pkgs.sh2
-rw-r--r--common/hooks/post-pkg/00-register-pkg.sh6
-rw-r--r--common/hooks/pre-pkg/04-generate-runtime-deps.sh2
-rw-r--r--common/hooks/pre-pkg/05-prepare-32bit.sh13
-rw-r--r--common/hooks/pre-pkg/06-shlib-provides.sh2
-rw-r--r--common/xbps-src/shutils/common.sh9
-rw-r--r--common/xbps-src/shutils/pkgtarget.sh2
9 files changed, 11 insertions, 33 deletions
diff --git a/Manual.md b/Manual.md
index 386daa24362..9c0d094c0fe 100644
--- a/Manual.md
+++ b/Manual.md
@@ -733,7 +733,7 @@ Examples:
# Default value (all arches)
archs="*"
```
-Do not use noarch. It is deprecated and being removed.
+A special value `noarch` used to be available, but has since been removed.
<a id="explain_depends"></a>
#### About the many types of `depends` variables
diff --git a/common/hooks/do-pkg/00-gen-pkg.sh b/common/hooks/do-pkg/00-gen-pkg.sh
index b809a6dc5eb..f0b70c8eebb 100644
--- a/common/hooks/do-pkg/00-gen-pkg.sh
+++ b/common/hooks/do-pkg/00-gen-pkg.sh
@@ -104,14 +104,12 @@ hook() {
local arch= binpkg= repo= _pkgver= _desc= _pkgn= _pkgv= _provides= \
_replaces= _reverts= f= found_dbg_subpkg=
- if [ "${archs// /}" = "noarch" ]; then
- arch=noarch
- elif [ -n "$XBPS_TARGET_MACHINE" ]; then
+ if [ -n "$XBPS_TARGET_MACHINE" ]; then
arch=$XBPS_TARGET_MACHINE
else
arch=$XBPS_MACHINE
fi
- if [ "${archs// /}" != "noarch" -a -z "$XBPS_CROSS_BUILD" -a -n "$XBPS_ARCH" -a "$XBPS_ARCH" != "$XBPS_TARGET_MACHINE" ]; then
+ if [ -z "$XBPS_CROSS_BUILD" -a -n "$XBPS_ARCH" -a "$XBPS_ARCH" != "$XBPS_TARGET_MACHINE" ]; then
arch=${XBPS_ARCH}
fi
diff --git a/common/hooks/post-install/06-strip-and-debug-pkgs.sh b/common/hooks/post-install/06-strip-and-debug-pkgs.sh
index 44d8a51fe93..b59dde5ab3c 100644
--- a/common/hooks/post-install/06-strip-and-debug-pkgs.sh
+++ b/common/hooks/post-install/06-strip-and-debug-pkgs.sh
@@ -59,7 +59,7 @@ create_debug_pkg() {
hook() {
local fname= x= f= _soname= STRIPCMD=
- if [ -n "$nostrip" -o "${archs// /}" = "noarch" ]; then
+ if [ -n "$nostrip" ]; then
return 0
fi
diff --git a/common/hooks/post-pkg/00-register-pkg.sh b/common/hooks/post-pkg/00-register-pkg.sh
index 5dc28c999c9..ce641cfc850 100644
--- a/common/hooks/post-pkg/00-register-pkg.sh
+++ b/common/hooks/post-pkg/00-register-pkg.sh
@@ -13,14 +13,12 @@ registerpkg() {
hook() {
local arch= binpkg= pkgdir=
- if [ "${archs// /}" = "noarch" ]; then
- arch=noarch
- elif [ -n "$XBPS_TARGET_MACHINE" ]; then
+ if [ -n "$XBPS_TARGET_MACHINE" ]; then
arch=$XBPS_TARGET_MACHINE
else
arch=$XBPS_MACHINE
fi
- if [ "${archs// /}" != "noarch" -a -z "$XBPS_CROSS_BUILD" -a -n "$XBPS_ARCH" -a "$XBPS_ARCH" != "$XBPS_TARGET_MACHINE" ]; then
+ if [ -z "$XBPS_CROSS_BUILD" -a -n "$XBPS_ARCH" -a "$XBPS_ARCH" != "$XBPS_TARGET_MACHINE" ]; then
arch=${XBPS_ARCH}
fi
if [ -n "$repository" ]; then
diff --git a/common/hooks/pre-pkg/04-generate-runtime-deps.sh b/common/hooks/pre-pkg/04-generate-runtime-deps.sh
index 6e45b7dd3c3..8ffd3a71d8e 100644
--- a/common/hooks/pre-pkg/04-generate-runtime-deps.sh
+++ b/common/hooks/pre-pkg/04-generate-runtime-deps.sh
@@ -56,7 +56,7 @@ hook() {
mapshlibs=$XBPS_COMMONDIR/shlibs
- if [ "${archs// /}" = "noarch" -o -n "$noverifyrdeps" ]; then
+ if [ -n "$noverifyrdeps" ]; then
store_pkgdestdir_rundeps
return 0
fi
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
diff --git a/common/hooks/pre-pkg/06-shlib-provides.sh b/common/hooks/pre-pkg/06-shlib-provides.sh
index cdc94de3bc9..fc39f6bfbe4 100644
--- a/common/hooks/pre-pkg/06-shlib-provides.sh
+++ b/common/hooks/pre-pkg/06-shlib-provides.sh
@@ -45,7 +45,7 @@ collect_sonames() {
hook() {
local _destdir32=${XBPS_DESTDIR}/${pkgname}-32bit-${version}
- if [ -z "$shlib_provides" -a "${archs// /}" = "noarch" -o -n "$noshlibprovides" ]; then
+ if [ -n "$noshlibprovides" ]; then
return 0
fi
diff --git a/common/xbps-src/shutils/common.sh b/common/xbps-src/shutils/common.sh
index be75d31e622..1739124050f 100644
--- a/common/xbps-src/shutils/common.sh
+++ b/common/xbps-src/shutils/common.sh
@@ -328,7 +328,7 @@ get_subpkgs() {
setup_pkg() {
local pkg="$1" cross="$2" show_problems="$3"
- local basepkg val _vars f dbgflags arch extrarepo
+ local basepkg val _vars f dbgflags extrarepo
[ -z "$pkg" ] && return 1
basepkg=${pkg%-32bit}
@@ -469,13 +469,6 @@ setup_pkg() {
XBPS_MAKEJOBS=1
fi
makejobs="-j$XBPS_MAKEJOBS"
-
- # strip whitespaces to make " noarch " valid too.
- if [ "${archs// /}" = "noarch" ]; then
- arch="noarch"
- else
- arch="$XBPS_TARGET_MACHINE"
- fi
if [ -n "$XBPS_BINPKG_EXISTS" ]; then
local _binpkgver="$($XBPS_QUERY_XCMD -R -ppkgver $pkgver 2>/dev/null)"
if [ "$_binpkgver" = "$pkgver" ]; then
diff --git a/common/xbps-src/shutils/pkgtarget.sh b/common/xbps-src/shutils/pkgtarget.sh
index e064b7c2911..6c6f03ff726 100644
--- a/common/xbps-src/shutils/pkgtarget.sh
+++ b/common/xbps-src/shutils/pkgtarget.sh
@@ -3,7 +3,7 @@
check_pkg_arch() {
local cross="$1" _arch f match nonegation
- if [ -n "$archs" -a "${archs// /}" != "noarch" ]; then
+ if [ -n "$archs" ]; then
if [ -n "$cross" ]; then
_arch="$XBPS_TARGET_MACHINE"
elif [ -n "$XBPS_ARCH" ]; then