commit:     3f607b6de5778a3b3ddedc7a94f0cbaeb817b03b
Author:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 13 15:02:19 2026 +0000
Commit:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Fri Mar 13 15:02:19 2026 +0000
URL:        https://gitweb.gentoo.org/proj/binhost.git/commit/?id=3f607b6d

dola: build debug info

Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>

 builders/dola/gnome-23/portage/make.conf  | 10 ++++++++--
 builders/dola/kde-23/portage/make.conf    | 10 ++++++++--
 builders/dola/server-23/portage/make.conf | 10 ++++++++--
 3 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/builders/dola/gnome-23/portage/make.conf 
b/builders/dola/gnome-23/portage/make.conf
index 78a49c2..37f4227 100644
--- a/builders/dola/gnome-23/portage/make.conf
+++ b/builders/dola/gnome-23/portage/make.conf
@@ -5,13 +5,13 @@
 
 # For now, we enforce LTO warnings but only enable LTO for certain packages.
 LTOFLAGS="-Werror=odr -Werror=lto-type-mismatch -Werror=strict-aliasing"
-COMMON_FLAGS="-O2 -pipe ${LTOFLAGS}"
+COMMON_FLAGS="-O2 -pipe -g ${LTOFLAGS}"
 CFLAGS="${COMMON_FLAGS}"
 CXXFLAGS="${COMMON_FLAGS}"
 FCFLAGS="${COMMON_FLAGS}"
 FFLAGS="${COMMON_FLAGS}"
 
-LDFLAGS="${LDFLAGS} ${LTOFLAGS}"
+LDFLAGS="${LDFLAGS} -g ${LTOFLAGS}"
 
 # NOTE: This stage was built with the bindist Use flag enabled
 PORTDIR="/var/db/repos/gentoo"
@@ -30,6 +30,12 @@ EMERGE_DEFAULT_OPTS="--jobs 20 --load-average 80 --quiet 
--keep-going --binpkg-r
 
 FEATURES="binpkg-multi-instance buildpkg compress-index -network-sandbox 
notitles jobserver-token"
 
+# don't install 'duplicate' copies of debug information to the live filesystem 
outside of produced packdebug tarballs
+INSTALL_MASK="${INSTALL_MASK} /usr/lib/debug/ /usr/src/debug/ 
-/usr/lib/debug/.tarball"
+
+# Produce separate debuginfo tarballs in /usr/lib/debug/.tarball
+FEATURES="${FEATURES} packdebug splitdebug compressdebug installsources 
dedupdebug"
+
 PORTAGE_BINHOST_TTL="3600"
 BINPKG_FORMAT="gpkg"
 BINPKG_COMPRESS="xz"

diff --git a/builders/dola/kde-23/portage/make.conf 
b/builders/dola/kde-23/portage/make.conf
index 8b21fc4..3cdfc76 100644
--- a/builders/dola/kde-23/portage/make.conf
+++ b/builders/dola/kde-23/portage/make.conf
@@ -5,13 +5,13 @@
 
 # For now, we enforce LTO warnings but only enable LTO for certain packages.
 LTOFLAGS="-Werror=odr -Werror=lto-type-mismatch -Werror=strict-aliasing"
-COMMON_FLAGS="-O2 -pipe ${LTOFLAGS}"
+COMMON_FLAGS="-O2 -pipe -g ${LTOFLAGS}"
 CFLAGS="${COMMON_FLAGS}"
 CXXFLAGS="${COMMON_FLAGS}"
 FCFLAGS="${COMMON_FLAGS}"
 FFLAGS="${COMMON_FLAGS}"
 
-LDFLAGS="${LDFLAGS} ${LTOFLAGS}"
+LDFLAGS="${LDFLAGS} -g ${LTOFLAGS}"
 
 # NOTE: This stage was built with the bindist Use flag enabled
 PORTDIR="/var/db/repos/gentoo"
@@ -30,6 +30,12 @@ EMERGE_DEFAULT_OPTS="--jobs 20 --load-average 80 --quiet 
--keep-going --binpkg-r
 
 FEATURES="binpkg-multi-instance buildpkg compress-index -network-sandbox 
notitles jobserver-token"
 
+# don't install 'duplicate' copies of debug information to the live filesystem 
outside of produced packdebug tarballs
+INSTALL_MASK="${INSTALL_MASK} /usr/lib/debug/ /usr/src/debug/ 
-/usr/lib/debug/.tarball"
+
+# Produce separate debuginfo tarballs in /usr/lib/debug/.tarball
+FEATURES="${FEATURES} packdebug splitdebug compressdebug installsources 
dedupdebug"
+
 PORTAGE_BINHOST_TTL="3600"
 BINPKG_FORMAT="gpkg"
 BINPKG_COMPRESS="xz"

diff --git a/builders/dola/server-23/portage/make.conf 
b/builders/dola/server-23/portage/make.conf
index 8b21fc4..3cdfc76 100644
--- a/builders/dola/server-23/portage/make.conf
+++ b/builders/dola/server-23/portage/make.conf
@@ -5,13 +5,13 @@
 
 # For now, we enforce LTO warnings but only enable LTO for certain packages.
 LTOFLAGS="-Werror=odr -Werror=lto-type-mismatch -Werror=strict-aliasing"
-COMMON_FLAGS="-O2 -pipe ${LTOFLAGS}"
+COMMON_FLAGS="-O2 -pipe -g ${LTOFLAGS}"
 CFLAGS="${COMMON_FLAGS}"
 CXXFLAGS="${COMMON_FLAGS}"
 FCFLAGS="${COMMON_FLAGS}"
 FFLAGS="${COMMON_FLAGS}"
 
-LDFLAGS="${LDFLAGS} ${LTOFLAGS}"
+LDFLAGS="${LDFLAGS} -g ${LTOFLAGS}"
 
 # NOTE: This stage was built with the bindist Use flag enabled
 PORTDIR="/var/db/repos/gentoo"
@@ -30,6 +30,12 @@ EMERGE_DEFAULT_OPTS="--jobs 20 --load-average 80 --quiet 
--keep-going --binpkg-r
 
 FEATURES="binpkg-multi-instance buildpkg compress-index -network-sandbox 
notitles jobserver-token"
 
+# don't install 'duplicate' copies of debug information to the live filesystem 
outside of produced packdebug tarballs
+INSTALL_MASK="${INSTALL_MASK} /usr/lib/debug/ /usr/src/debug/ 
-/usr/lib/debug/.tarball"
+
+# Produce separate debuginfo tarballs in /usr/lib/debug/.tarball
+FEATURES="${FEATURES} packdebug splitdebug compressdebug installsources 
dedupdebug"
+
 PORTAGE_BINHOST_TTL="3600"
 BINPKG_FORMAT="gpkg"
 BINPKG_COMPRESS="xz"

Reply via email to