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

xbps-src: use "disable_debug" to disable -dbg subpkg creation.

Browse source
This commit is contained in:
Juan RP 2014-10-11 09:57:27 +02:00
parent 28714801d6
commit b2976da1c8
3 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Manual.md
View file

@ -387,6 +387,8 @@ 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.
- `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
`command line arguments`. `command line arguments`.

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

@ -16,7 +16,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 force_debug_pkgs unset -v disable_debug 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/03-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 "$nonfree" ] && return 0 [ -z "$XBPS_DEBUG_PKGS" -o -n "$disable_debug" -o -n "$nonfree" ] && 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 "$nonfree" ] && return 0 [ -z "$XBPS_DEBUG_PKGS" -o -n "$disable_debug" -o -n "$nonfree" ] && 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 "$nonfree" ] && return 0 [ -z "$XBPS_DEBUG_PKGS" -o -n "$disable_debug" -o -n "$nonfree" ] && return 0
[ ! -d "${PKGDESTDIR}/usr/lib/debug" ] && return 0 [ ! -d "${PKGDESTDIR}/usr/lib/debug" ] && return 0
_pkgname="${pkgname}-dbg-${version}" _pkgname="${pkgname}-dbg-${version}"