[pacman-dev] [PATCH 1/2] Build a single debug package for all packages from a PKGBUILD

[Allan McRae]

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 at archlinux.org>
---
 scripts/libmakepkg/tidy/strip.sh.in |  2 +-
 scripts/makepkg.sh.in               | 18 ++++++++++++------
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/scripts/libmakepkg/tidy/strip.sh.in b/scripts/libmakepkg/tidy/strip.sh.in
index 1c7aacf..9baed9f 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- at DEBUGSUFFIX@/usr/lib/debug"
+			dbgdir="$pkgdirbase/$pkgbase- at DEBUGSUFFIX@/usr/lib/debug"
 			mkdir -p "$dbgdir"
 		fi
 
diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in
index 2000451..de709ba 100644
--- a/scripts/makepkg.sh.in
+++ b/scripts/makepkg.sh.in
@@ -787,18 +787,24 @@ create_debug_package() {
 		return
 	fi
 
-	pkgdir="${pkgdir}- at DEBUGSUFFIX@"
+	pkgdir="$pkgdirbase/$pkgbase- at 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- at 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- at DEBUGSUFFIX@")
+		fi
+	done
+
+	pkgdesc="Detached debugging symbols for $pkgname"
+	pkgname=$pkgbase- at 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() {
-- 
2.10.2