manuel
/
void-packages
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

xbps-src: respect XBPS_DEBUG_PKGS for bootstrap pkgs too.

This commit is contained in:
Juan RP 2014-11-05 17:29:28 +01:00
parent a6432a664e
commit 457fd7aefb
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
common/hooks/post-install/06-strip-and-debug-pkgs.sh
View File

@ -6,7 +6,7 @@
make_debug() { make_debug() {
local dname= fname= dbgfile= local dname= fname= dbgfile=
[ -z "$XBPS_DEBUG_PKGS" -o -n "$disable_debug" -o "$repository" = "nonfree" ] && return 0 [ -n "$disable_debug" ] && return 0
dname=$(echo "$(dirname $1)"|sed -e "s|${PKGDESTDIR}||g") dname=$(echo "$(dirname $1)"|sed -e "s|${PKGDESTDIR}||g")
fname="$(basename $1)" fname="$(basename $1)"
@ -25,7 +25,7 @@ make_debug() {
attach_debug() { attach_debug() {
local dname= fname= dbgfile= local dname= fname= dbgfile=
[ -z "$XBPS_DEBUG_PKGS" -o -n "$disable_debug" -o "$repository" = "nonfree" ] && return 0 [ -n "$disable_debug" ] && return 0
dname=$(echo "$(dirname $1)"|sed -e "s|${PKGDESTDIR}||g") dname=$(echo "$(dirname $1)"|sed -e "s|${PKGDESTDIR}||g")
fname="$(basename $1)" fname="$(basename $1)"
@ -41,7 +41,7 @@ attach_debug() {
create_debug_pkg() { create_debug_pkg() {
local _pkgname= _destdir= local _pkgname= _destdir=
[ -z "$XBPS_DEBUG_PKGS" -o -n "$disable_debug" -o "$repository" = "nonfree" ] && return 0 [ -n "$disable_debug" ] && return 0
[ ! -d "${PKGDESTDIR}/usr/lib/debug" ] && return 0 [ ! -d "${PKGDESTDIR}/usr/lib/debug" ] && return 0
_pkgname="${pkgname}-dbg-${version}" _pkgname="${pkgname}-dbg-${version}"

3
common/xbps-src/shutils/common.sh
View File

@ -319,8 +319,7 @@ setup_pkg() {
makejobs="-j$XBPS_MAKEJOBS" makejobs="-j$XBPS_MAKEJOBS"
fi fi
# For nonfree/bootstrap pkgs there's no point in building -dbg pkgs, disable them. if [ -z "$XBPS_DEBUG_PKGS" -o "$repository" = "nonfree" ]; then
if [ -z "$XBPS_DEBUG_PKGS" -o "$repository" = "nonfree" -o -n "$bootstrap" ]; then
disable_debug=yes disable_debug=yes
fi fi
# If a package sets force_debug_pkgs, always build -dbg pkgs. # If a package sets force_debug_pkgs, always build -dbg pkgs.