r6423 - in glibc-package/branches/glibc-2.21/debian: . rules.d sysdeps
Author: adconrad
Date: 2015-03-22 15:43:54 +0000 (Sun, 22 Mar 2015)
New Revision: 6423
Modified:
glibc-package/branches/glibc-2.21/debian/changelog
glibc-package/branches/glibc-2.21/debian/rules.d/debhelper.mk
glibc-package/branches/glibc-2.21/debian/sysdeps/hurd.mk
glibc-package/branches/glibc-2.21/debian/sysdeps/kfreebsd.mk
glibc-package/branches/glibc-2.21/debian/sysdeps/linux.mk
Log:
debian/{rules.d/debhelper.mk,sysdeps/*}: Define per-platform pldd
variable to control installation of usr/bin/pldd in libc-bin, and
leverage the same trick to decide to install usr/lib/pt_chown too.
Modified: glibc-package/branches/glibc-2.21/debian/changelog
===================================================================
--- glibc-package/branches/glibc-2.21/debian/changelog 2015-03-22 15:21:24 UTC (rev 6422)
+++ glibc-package/branches/glibc-2.21/debian/changelog 2015-03-22 15:43:54 UTC (rev 6423)
@@ -1,5 +1,6 @@
glibc (2.21-0experimental1) UNRELEASED; urgency=medium
+ [ Samuel Thibault ]
* patches/hurd-i386/cvs-libpthread.diff: Update from upstream.
* patches/hurd-i386/cvs-libpthread-dlopen.diff: Merged.
* patches/hurd-i386/cvs-libpthread-libc-lockP2.diff: Merged.
@@ -42,6 +43,11 @@
* patches/hurd-i386/cvs-libpthread-warnings.diff: New patch, fixes warnings.
* sysdeps/hurd.mk: Disable -Werror since MIG currently generates warnings.
+ [ Adam Conrad ]
+ * debian/{rules.d/debhelper.mk,sysdeps/*}: Define per-platform pldd
+ variable to control installation of usr/bin/pldd in libc-bin, and
+ leverage the same trick to decide to install usr/lib/pt_chown too.
+
-- Samuel Thibault <sthibault@debian.org> Fri, 20 Mar 2015 12:30:54 +0000
glibc (2.21-0experimental0) experimental; urgency=medium
Modified: glibc-package/branches/glibc-2.21/debian/rules.d/debhelper.mk
===================================================================
--- glibc-package/branches/glibc-2.21/debian/rules.d/debhelper.mk 2015-03-22 15:21:24 UTC (rev 6422)
+++ glibc-package/branches/glibc-2.21/debian/rules.d/debhelper.mk 2015-03-22 15:43:54 UTC (rev 6423)
@@ -170,6 +170,8 @@
case $$y in \
*.install) \
sed -e "s/^#.*//" -i $$y ; \
+ $(if $(filter $(pt_chown),no),sed -e "/pt_chown/d" -i $$y ;) \
+ $(if $(filter $(pldd),no),sed -e "/pldd/d" -i $$y ;) \
;; \
esac; \
done
Modified: glibc-package/branches/glibc-2.21/debian/sysdeps/hurd.mk
===================================================================
--- glibc-package/branches/glibc-2.21/debian/sysdeps/hurd.mk 2015-03-22 15:21:24 UTC (rev 6422)
+++ glibc-package/branches/glibc-2.21/debian/sysdeps/hurd.mk 2015-03-22 15:43:54 UTC (rev 6423)
@@ -3,6 +3,8 @@
# Build and expect pt_chown on this platform
pt_chown = yes
+# Expect pldd on this platform
+pldd = no
# Linuxthreads Config (we claim "no threads" as nptl keys off this)
threads = no
Modified: glibc-package/branches/glibc-2.21/debian/sysdeps/kfreebsd.mk
===================================================================
--- glibc-package/branches/glibc-2.21/debian/sysdeps/kfreebsd.mk 2015-03-22 15:21:24 UTC (rev 6422)
+++ glibc-package/branches/glibc-2.21/debian/sysdeps/kfreebsd.mk 2015-03-22 15:43:54 UTC (rev 6423)
@@ -4,6 +4,8 @@
# Build and expect pt_chown on this platform
pt_chown = yes
+# Expect pldd on this platform
+pldd = no
# NPTL Config
threads = yes
Modified: glibc-package/branches/glibc-2.21/debian/sysdeps/linux.mk
===================================================================
--- glibc-package/branches/glibc-2.21/debian/sysdeps/linux.mk 2015-03-22 15:21:24 UTC (rev 6422)
+++ glibc-package/branches/glibc-2.21/debian/sysdeps/linux.mk 2015-03-22 15:43:54 UTC (rev 6423)
@@ -4,6 +4,8 @@
# Build and expect pt_chown on this platform
pt_chown = yes
+# Expect pldd on this platform
+pldd = yes
# NPTL Config
threads = yes
Reply to: