Author: sthibault Date: 2015-08-28 22:09:48 +0000 (Fri, 28 Aug 2015) New Revision: 6500
Modified: glibc-package/branches/glibc-2.21/debian/changelog glibc-package/branches/glibc-2.21/debian/patches/hurd-i386/local-clock_gettime_MONOTONIC.diff Log: port r6498 from trunk: local-clock_gettime_MONOTONIC.diff: Update patch to not advertise _POSIX_CLOCK_SELECTION, for vlc Modified: glibc-package/branches/glibc-2.21/debian/changelog =================================================================== --- glibc-package/branches/glibc-2.21/debian/changelog 2015-08-28 21:55:16 UTC (rev 6499) +++ glibc-package/branches/glibc-2.21/debian/changelog 2015-08-28 22:09:48 UTC (rev 6500) @@ -242,6 +242,8 @@ * sysdeps/hurd.mk: Create symlinks to kernel and hurd headers required for build, so that we can pass --with-headers to configure to make the build really self-hosted. + * patches/hurd-i386/local-clock_gettime_MONOTONIC.diff: Update patch to not + advertise _POSIX_CLOCK_SELECTION for vlc -- Samuel Thibault <sthiba...@debian.org> Sun, 09 Aug 2015 20:00:16 +0000 Modified: glibc-package/branches/glibc-2.21/debian/patches/hurd-i386/local-clock_gettime_MONOTONIC.diff =================================================================== --- glibc-package/branches/glibc-2.21/debian/patches/hurd-i386/local-clock_gettime_MONOTONIC.diff 2015-08-28 21:55:16 UTC (rev 6499) +++ glibc-package/branches/glibc-2.21/debian/patches/hurd-i386/local-clock_gettime_MONOTONIC.diff 2015-08-28 22:09:48 UTC (rev 6500) @@ -2,6 +2,10 @@ implementation (which is being done in Mach), but will permit to fix at least the iceweasel stack. +vlc however doesn't build when _POSIX_CLOCK_SELECTION is enabled but +_POSIX_TIMERS is not, and they refuse to fix that (see #765578), so disable the +former. + --- sysdeps/mach/hurd/bits/posix_opt.h | 2 +- sysdeps/unix/clock_gettime.c | 1 + @@ -22,12 +26,17 @@ =================================================================== --- eglibc-2.16.orig/sysdeps/mach/hurd/bits/posix_opt.h 2012-07-23 00:41:03.000000000 +0200 +++ eglibc-2.16/sysdeps/mach/hurd/bits/posix_opt.h 2012-07-23 00:41:10.000000000 +0200 -@@ -163,7 +163,7 @@ +@@ -163,10 +163,10 @@ #define _POSIX_THREAD_PROCESS_SHARED -1 /* The monotonic clock might be available. */ -#define _POSIX_MONOTONIC_CLOCK 0 +#define _POSIX_MONOTONIC_CLOCK 200809L - /* The clock selection interfaces are available. */ - #define _POSIX_CLOCK_SELECTION 200809L +-/* The clock selection interfaces are available. */ ++/* The clock selection interfaces are not really available yet. */ +-#define _POSIX_CLOCK_SELECTION 200809L ++#define _POSIX_CLOCK_SELECTION -1 + + /* Advisory information interfaces could be available in future. */ + #define _POSIX_ADVISORY_INFO 0