Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAllan McRae <allan@archlinux.org>2016-12-05 14:44:51 +1000
committerAllan McRae <allan@archlinux.org>2016-12-05 15:23:44 +1000
commit9a4d61622066d5d30c649f1c958b26526a4ceddf (patch)
tree12c3f1ef37f92e9458ecf8ca4ca834fc9aaec020
parentc40ee73bc40d239702d288f922e50db1a82915d4 (diff)
Build a single debug package for all packages from a PKGBUILD
We want to provide source files with debug symbol packages to allow easy stepping through the program. This becomes difficult with split packages due to the binaries in many of these sharing source files across packages. There are (at least) two solutions to this problem. #1: ensure common source files are located in the debug package for the package lowest in the dependency chain and add dependencies to the debug packages so all require source files are present, or #2: create one debug package for all split packages in a PKGBUILD. The second is a more robust approach despite potentially creating very large debug packages. This patch creates a single $pkgbase-debug package and adds provides such that installing $pkgname-debug will always work. Signed-off-by: Allan McRae <allan@archlinux.org>
-rw-r--r--scripts/libmakepkg/tidy/strip.sh.in2
-rw-r--r--scripts/makepkg.sh.in18
2 files changed, 13 insertions, 7 deletions
diff --git a/scripts/libmakepkg/tidy/strip.sh.in b/scripts/libmakepkg/tidy/strip.sh.in
index 1c7aacfd..9baed9f4 100644
--- a/scripts/libmakepkg/tidy/strip.sh.in
+++ b/scripts/libmakepkg/tidy/strip.sh.in
@@ -88,7 +88,7 @@ tidy_strip() {
[[ -z ${STRIP_STATIC+x} ]] && STRIP_STATIC="-S"
if check_option "debug" "y"; then
- dbgdir="$pkgdir-@DEBUGSUFFIX@/usr/lib/debug"
+ dbgdir="$pkgdirbase/$pkgbase-@DEBUGSUFFIX@/usr/lib/debug"
mkdir -p "$dbgdir"
fi
diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in
index 20004516..de709baf 100644
--- a/scripts/makepkg.sh.in
+++ b/scripts/makepkg.sh.in
@@ -787,18 +787,24 @@ create_debug_package() {
return
fi
- pkgdir="${pkgdir}-@DEBUGSUFFIX@"
+ pkgdir="$pkgdirbase/$pkgbase-@DEBUGSUFFIX@"
# check if we have any debug symbols to package
if dir_is_empty "$pkgdir/usr/lib/debug"; then
return
fi
- depends=("$pkgname=$(get_full_version)")
- pkgdesc="Detached debugging symbols for $pkgname"
- pkgname=$pkgname-@DEBUGSUFFIX@
+ unset groups depends optdepends provides conflicts replaces backup install changelog
- unset groups optdepends provides conflicts replaces backup install changelog
+ local pkg
+ for pkg in ${pkgname[@]}; do
+ if [[ $pkg != $pkgbase ]]; then
+ provides+=("$pkg-@DEBUGSUFFIX@")
+ fi
+ done
+
+ pkgdesc="Detached debugging symbols for $pkgname"
+ pkgname=$pkgbase-@DEBUGSUFFIX@
create_package
}
@@ -1169,10 +1175,10 @@ run_split_packaging() {
tidy_install
lint_package || exit 1
create_package
- create_debug_package
restore_package_variables
done
pkgname=("${pkgname_backup[@]}")
+ create_debug_package
}
usage() {