moritzruth/void-packages
1
0
Fork 0
Code Releases Activity Actions 2

xbps-src: remove noarch

Browse source
This commit is contained in:
q66 2021-01-20 12:55:11 +01:00
parent 06d3472acd
commit cb804fbf85
9 changed files with 11 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

6
common/hooks/do-pkg/00-gen-pkg.sh
View file

@ -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

2
common/hooks/post-install/06-strip-and-debug-pkgs.sh
View file

@ -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

6
common/hooks/post-pkg/00-register-pkg.sh
View file

@ -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

2
common/hooks/pre-pkg/04-generate-runtime-deps.sh
View file

@ -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

13
common/hooks/pre-pkg/05-prepare-32bit.sh
View file

@ -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

2
common/hooks/pre-pkg/06-shlib-provides.sh
View file

@ -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