r6424 - in glibc-package/branches/glibc-2.21/debian: . patches patches/kfreebsd
Author: adconrad
Date: 2015-03-22 15:48:56 +0000 (Sun, 22 Mar 2015)
New Revision: 6424
Removed:
glibc-package/branches/glibc-2.21/debian/patches/kfreebsd/local-no-pldd.diff
Modified:
glibc-package/branches/glibc-2.21/debian/changelog
glibc-package/branches/glibc-2.21/debian/patches/series.kfreebsd-amd64
glibc-package/branches/glibc-2.21/debian/patches/series.kfreebsd-i386
Log:
debian/patches/kfreebsd/local-no-pldd.diff: Drop, no longer used.
Modified: glibc-package/branches/glibc-2.21/debian/changelog
===================================================================
--- glibc-package/branches/glibc-2.21/debian/changelog 2015-03-22 15:43:54 UTC (rev 6423)
+++ glibc-package/branches/glibc-2.21/debian/changelog 2015-03-22 15:48:56 UTC (rev 6424)
@@ -47,6 +47,7 @@
* 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.
+ * debian/patches/kfreebsd/local-no-pldd.diff: Drop, no longer used.
-- Samuel Thibault <sthibault@debian.org> Fri, 20 Mar 2015 12:30:54 +0000
Deleted: glibc-package/branches/glibc-2.21/debian/patches/kfreebsd/local-no-pldd.diff
===================================================================
--- glibc-package/branches/glibc-2.21/debian/patches/kfreebsd/local-no-pldd.diff 2015-03-22 15:43:54 UTC (rev 6423)
+++ glibc-package/branches/glibc-2.21/debian/patches/kfreebsd/local-no-pldd.diff 2015-03-22 15:48:56 UTC (rev 6424)
@@ -1,35 +0,0 @@
---- a/elf/pldd.c
-+++ b/elf/pldd.c
-@@ -90,6 +90,11 @@
- int
- main (int argc, char *argv[])
- {
-+#if !defined(__linux__)
-+ fprintf (stderr," Unsupported utility\n");
-+ return 1;
-+#else
-+
- /* Parse and process arguments. */
- int remaining;
- argp_parse (&argp, argc, argv, 0, &remaining, NULL);
-@@ -194,6 +199,7 @@
- close (dfd);
-
- return status;
-+#endif
- }
-
-
-@@ -243,6 +249,7 @@
- fprintf (stream, gettext ("Written by %s.\n"), "Ulrich Drepper");
- }
-
-+#if defined(__linux__)
-
- #define CLASS 32
- #include "pldd-xx.c"
-@@ -312,3 +319,4 @@
-
- return retval;
- }
-+#endif
Modified: glibc-package/branches/glibc-2.21/debian/patches/series.kfreebsd-amd64
===================================================================
--- glibc-package/branches/glibc-2.21/debian/patches/series.kfreebsd-amd64 2015-03-22 15:43:54 UTC (rev 6423)
+++ glibc-package/branches/glibc-2.21/debian/patches/series.kfreebsd-amd64 2015-03-22 15:48:56 UTC (rev 6424)
@@ -2,5 +2,4 @@
kfreebsd/local-sys_queue_h.diff
kfreebsd/local-undef-glibc.diff
kfreebsd/local-initgroups-order.diff
-kfreebsd/local-no-pldd.diff
kfreebsd/local-nscd-no-sockcloexec.diff
Modified: glibc-package/branches/glibc-2.21/debian/patches/series.kfreebsd-i386
===================================================================
--- glibc-package/branches/glibc-2.21/debian/patches/series.kfreebsd-i386 2015-03-22 15:43:54 UTC (rev 6423)
+++ glibc-package/branches/glibc-2.21/debian/patches/series.kfreebsd-i386 2015-03-22 15:48:56 UTC (rev 6424)
@@ -2,5 +2,4 @@
kfreebsd/local-sys_queue_h.diff
kfreebsd/local-undef-glibc.diff
kfreebsd/local-initgroups-order.diff
-kfreebsd/local-no-pldd.diff
kfreebsd/local-nscd-no-sockcloexec.diff
Reply to: