wallenstein/void-packages
1
0
Fork 0
mirror of https://github.com/void-linux/void-packages.git synced 2025-07-28 00:12:56 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

xbps-src: avoid double slash on DESTDIR

Browse source
This commit is contained in:
Đoàn Trần Công Danh 2025-04-10 19:37:25 +07:00
parent 401f87c2ee
commit 3cbe04c9bf
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -143,7 +143,7 @@ hook() {
_pkgver=${pkgname}-dbg-${version}_${revision} _pkgver=${pkgname}-dbg-${version}_${revision}
_desc="${short_desc} (debug files)" _desc="${short_desc} (debug files)"
binpkg=${_pkgver}.${arch}.xbps binpkg=${_pkgver}.${arch}.xbps
PKGDESTDIR="${XBPS_DESTDIR}/${XBPS_CROSS_TRIPLET}/${pkgname}-dbg-${version}" PKGDESTDIR="${XBPS_DESTDIR}/${XBPS_CROSS_TRIPLET:+${XBPS_CROSS_TRIPLET}/}${pkgname}-dbg-${version}"
genpkg ${repo} ${arch} "${_desc}" ${_pkgver} ${binpkg} -dbg genpkg ${repo} ${arch} "${_desc}" ${_pkgver} ${binpkg} -dbg
fi fi
# Generate 32bit pkg. # Generate 32bit pkg.

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

@ -30,7 +30,7 @@ hook() {
# Register -dbg binpkg if it exists. # Register -dbg binpkg if it exists.
pkgdir=$XBPS_REPOSITORY/debug pkgdir=$XBPS_REPOSITORY/debug
PKGDESTDIR="${XBPS_DESTDIR}/${XBPS_CROSS_TRIPLET}/${pkgname}-dbg-${version}" PKGDESTDIR="${XBPS_DESTDIR}/${XBPS_CROSS_TRIPLET:+${XBPS_CROSS_TRIPLET}/}${pkgname}-dbg-${version}"
if [ -d ${PKGDESTDIR} -a -f ${pkgdir}/${binpkg_dbg} ]; then if [ -d ${PKGDESTDIR} -a -f ${pkgdir}/${binpkg_dbg} ]; then
registerpkg ${pkgdir} ${binpkg_dbg} registerpkg ${pkgdir} ${binpkg_dbg}
fi fi

4
common/xbps-src/shutils/common.sh
View file

@ -539,8 +539,8 @@ setup_pkg() {
FILESDIR=$XBPS_SRCPKGDIR/$sourcepkg/files FILESDIR=$XBPS_SRCPKGDIR/$sourcepkg/files
PATCHESDIR=$XBPS_SRCPKGDIR/$sourcepkg/patches PATCHESDIR=$XBPS_SRCPKGDIR/$sourcepkg/patches
DESTDIR=$XBPS_DESTDIR/$XBPS_CROSS_TRIPLET/${sourcepkg}-${version} DESTDIR=${XBPS_DESTDIR}/${XBPS_CROSS_TRIPLET:+${XBPS_CROSS_TRIPLET}/}/${sourcepkg}-${version}
PKGDESTDIR=$XBPS_DESTDIR/$XBPS_CROSS_TRIPLET/${pkg}-${version} PKGDESTDIR=${XBPS_DESTDIR}/${XBPS_CROSS_TRIPLET:+$XBPS_CROSS_TRIPLET/}${pkg}-${version}
export XBPS_ORIG_MAKEJOBS=${XBPS_ORIG_MAKEJOBS:=$XBPS_MAKEJOBS} export XBPS_ORIG_MAKEJOBS=${XBPS_ORIG_MAKEJOBS:=$XBPS_MAKEJOBS}
if [ -n "$disable_parallel_build" ]; then if [ -n "$disable_parallel_build" ]; then