[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[glibc] 01/01: debian/rules.d/build.mk, debian/debhelper.in/libc-dev.install, debian/debhelper.in/libc-dev-alt.install: install the NPTL GDB pretty-printer python macros in the libc6-dev and libc6-*-dev packages. Closes: #868247.



This is an automated email from the git hooks/post-receive script.

aurel32 pushed a commit to branch glibc-2.25
in repository glibc.

commit 690800d80295c94c05f4c6d23de86cefb0c68cb6
Author: Aurelien Jarno <aurelien@aurel32.net>
Date:   Wed Aug 16 20:13:10 2017 +0200

    debian/rules.d/build.mk, debian/debhelper.in/libc-dev.install, debian/debhelper.in/libc-dev-alt.install: install the NPTL GDB pretty-printer python macros in the libc6-dev and libc6-*-dev packages. Closes: #868247.
---
 debian/changelog                         | 4 ++++
 debian/debhelper.in/libc-dev-alt.install | 2 ++
 debian/debhelper.in/libc-dev.install     | 3 +++
 debian/rules.d/build.mk                  | 7 +++++++
 4 files changed, 16 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 6871ff1..b3a28ba 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -34,6 +34,10 @@ glibc (2.25-0experimental1) UNRELEASED; urgency=medium
     testsuite.
   * debian/control.in/opt: Remove transitional packages libc0.1-i686,
     libc0.3-i686, libc6-i686.
+  * debian/rules.d/build.mk, debian/debhelper.in/libc-dev.install,
+    debian/debhelper.in/libc-dev-alt.install: install the NPTL GDB
+    pretty-printer python macros in the libc6-dev and libc6-*-dev packages.
+    Closes: #868247.
 
   [ John David Anglin ]
   * debian/patches/any/submitted-resolv-unaligned.diff: new patch to fix
diff --git a/debian/debhelper.in/libc-dev-alt.install b/debian/debhelper.in/libc-dev-alt.install
index 76a108a..98eafd8 100644
--- a/debian/debhelper.in/libc-dev-alt.install
+++ b/debian/debhelper.in/libc-dev-alt.install
@@ -20,3 +20,5 @@ TMPDIR/LIBDIR/libutil.a LIBDIR
 
 TMPDIR/LIBDIR/*.o LIBDIR
 TMPDIR/LIBDIR/*.so LIBDIR
+
+TMPDIR/usr/share/gdb/* usr/share/gdb
diff --git a/debian/debhelper.in/libc-dev.install b/debian/debhelper.in/libc-dev.install
index e46713d..d758a19 100644
--- a/debian/debhelper.in/libc-dev.install
+++ b/debian/debhelper.in/libc-dev.install
@@ -17,6 +17,9 @@ TMPDIR/LIBDIR/libresolv.a LIBDIR
 TMPDIR/LIBDIR/librpcsvc.a LIBDIR
 TMPDIR/LIBDIR/librt.a LIBDIR
 TMPDIR/LIBDIR/libutil.a LIBDIR
+
 TMPDIR/LIBDIR/*.o LIBDIR
 TMPDIR/LIBDIR/*.so LIBDIR
+
 TMPDIR/usr/include/* usr/include
+TMPDIR/usr/share/gdb/* usr/share/gdb
diff --git a/debian/rules.d/build.mk b/debian/rules.d/build.mk
index 03c3ef9..c7003dc 100644
--- a/debian/rules.d/build.mk
+++ b/debian/rules.d/build.mk
@@ -212,6 +212,13 @@ else
 	  $(MAKE) -f debian/generate-supported.mk IN=localedata/SUPPORTED \
 	    OUT=debian/tmp-$(curpass)/usr/share/i18n/SUPPORTED; \
 	fi
+
+ifeq ($(DEB_HOST_ARCH_OS),linux)
+	# Install the Python pretty printers
+	mkdir -p $(CURDIR)/debian/tmp-$(curpass)/usr/share/gdb/auto-load/$(call xx,slibdir)
+	perl -pe 'BEGIN {undef $$/; open(IN, "$(DEB_BUILDDIR)/nptl/nptl_lock_constants.py"); $$j=<IN>;} s/from nptl_lock_constants import \*/$$j/g;' \
+		$(CURDIR)/nptl/nptl-printers.py > $(CURDIR)/debian/tmp-$(curpass)/usr/share/gdb/auto-load/$(call xx,slibdir)/libpthread-$(GLIBC_VERSION).so-gdb.py
+endif
 endif
 
 	# Create the multiarch directories, and the configuration file in /etc/ld.so.conf.d

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-glibc/glibc.git


Reply to: