snailed
/
void-packages
2
0
Fork 0
Code Issues 1 Pull Requests 1 Actions Activity

xbps-src: rename disable_debug to nodebug, to follow our naming convention.

This commit is contained in:
Juan RP 2014-11-16 11:52:36 +01:00
parent 91b879add8
commit 8ade12549f
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Manual.md
View File

@ -393,7 +393,7 @@ files are always removed automatically.
This must match the basename of any url defined in `${distfiles}`. This must match the basename of any url defined in `${distfiles}`.
Example `skip_extraction="foo-${version}.tar.gz"`. Example `skip_extraction="foo-${version}.tar.gz"`.
- `disable_debug` If enabled -dbg packages won't be generated even if `XBPS_DEBUG_PKGS` is set. - `nodebug` If enabled -dbg packages won't be generated even if `XBPS_DEBUG_PKGS` is set.
- `force_debug_pkgs` If enabled binary packages with debugging symbols will be generated - `force_debug_pkgs` If enabled binary packages with debugging symbols will be generated
even if `XBPS_DEBUG_PKGS` is disabled in `void-packages/etc/conf` or in the even if `XBPS_DEBUG_PKGS` is disabled in `void-packages/etc/conf` or in the

2
common/environment/setup/sourcepkg.sh
View File

@ -17,7 +17,7 @@ unset -v CC CXX CPP GCC LD AR AS RANLIB NM OBJDUMP OBJCOPY STRIP READELF
unset -v skip_extraction unset -v skip_extraction
# hooks/post-install/03-strip-and-debug-pkgs # hooks/post-install/03-strip-and-debug-pkgs
unset -v disable_debug force_debug_pkgs unset -v nodebug force_debug_pkgs
## FUNCTIONS ## FUNCTIONS
unset -f pre_fetch do_fetch post_fetch unset -f pre_fetch do_fetch post_fetch

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=
[ -n "$disable_debug" ] && return 0 [ -n "$nodebug" ] && 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=
[ -n "$disable_debug" ] && return 0 [ -n "$nodebug" ] && 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=
[ -n "$disable_debug" ] && return 0 [ -n "$nodebug" ] && return 0
[ ! -d "${PKGDESTDIR}/usr/lib/debug" ] && return 0 [ ! -d "${PKGDESTDIR}/usr/lib/debug" ] && return 0
_pkgname="${pkgname}-dbg-${version}" _pkgname="${pkgname}-dbg-${version}"

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

@ -320,14 +320,14 @@ setup_pkg() {
fi fi
if [ -z "$XBPS_DEBUG_PKGS" -o "$repository" = "nonfree" ]; then if [ -z "$XBPS_DEBUG_PKGS" -o "$repository" = "nonfree" ]; then
disable_debug=yes nodebug=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.
if [ -n "$force_debug_pkgs" ]; then if [ -n "$force_debug_pkgs" ]; then
unset disable_debug unset nodebug
fi fi
# -g is required to build -dbg packages. # -g is required to build -dbg packages.
if [ -z "$disable_debug" ]; then if [ -z "$nodebug" ]; then
dbgflags="-g" dbgflags="-g"
fi fi