r4574 - in glibc-package/branches/eglibc-2.13/debian: . patches patches/hppa
Author: aurel32
Date: 2011-03-11 17:15:18 +0000 (Fri, 11 Mar 2011)
New Revision: 4574
Added:
glibc-package/branches/eglibc-2.13/debian/patches/hppa/submitted-fcntl_h.diff
Modified:
glibc-package/branches/eglibc-2.13/debian/changelog
glibc-package/branches/eglibc-2.13/debian/patches/series
Log:
* Add patches/hppa/submitted-fcntl_h.diff to partially fix FTBFS on
hppa.
Modified: glibc-package/branches/eglibc-2.13/debian/changelog
===================================================================
--- glibc-package/branches/eglibc-2.13/debian/changelog 2011-03-11 17:14:01 UTC (rev 4573)
+++ glibc-package/branches/eglibc-2.13/debian/changelog 2011-03-11 17:15:18 UTC (rev 4574)
@@ -134,6 +134,8 @@
on GNU/kFreeBSD.
* Add patches/s390/submitted-iconv-z9-109.diff to fix FTBFS on s390
with recent binutils.
+ * Add patches/hppa/submitted-fcntl_h.diff to partially fix FTBFS on
+ hppa.
[ Samuel Thibault ]
* Add patches/any/cvs-glro_dl_debug_mask.diff to fix build without
Added: glibc-package/branches/eglibc-2.13/debian/patches/hppa/submitted-fcntl_h.diff
===================================================================
--- glibc-package/branches/eglibc-2.13/debian/patches/hppa/submitted-fcntl_h.diff (rev 0)
+++ glibc-package/branches/eglibc-2.13/debian/patches/hppa/submitted-fcntl_h.diff 2011-03-11 17:15:18 UTC (rev 4574)
@@ -0,0 +1,49 @@
+2011-03-11 Aurelien Jarno <aurelien@aurel32.net>
+
+ * sysdeps/unix/sysv/linux/hppa/bits/fcntl.h (F_SETPIPE_SZ,
+ F_GETPIPE_SZ): Define.
+ * sysdeps/unix/sysv/linux/hppa/bits/fcntl.h: Define O_DIRECTORY,
+ O_NOFOLLOW, O_CLOEXEC, F_DUPFD_CLOEXEC, F_SETOWN, and F_GETOWN for
+ XPG7.
+
+--- a/ports/sysdeps/unix/sysv/linux/hppa/bits/fcntl.h
++++ b/ports/sysdeps/unix/sysv/linux/hppa/bits/fcntl.h
+@@ -46,13 +46,15 @@
+ #define O_ASYNC 020000
+ #define O_BLKSEEK 00000100 /* HPUX only */
+
+-#ifdef __USE_GNU
+-# define O_DIRECT 000040000 /* Direct disk access. */
++#ifdef __USE_XOPEN2K8
+ # define O_DIRECTORY 000010000 /* Must be a directory. */
+ # define O_NOFOLLOW 000000200 /* Do not follow links. */
+-# define O_NOATIME 004000000 /* Do not set atime. */
+ # define O_CLOEXEC 010000000 /* Set close_on_exec. */
+ #endif
++#ifdef __USE_GNU
++# define O_DIRECT 000040000 /* Direct disk access. */
++# define O_NOATIME 004000000 /* Do not set atime. */
++#endif
+
+ /* For now Linux has synchronisity options for data and read operations.
+ We define the symbols here but let them do the same as O_SYNC since
+@@ -85,7 +87,7 @@
+ #define F_SETLK64 9 /* Set record locking info (non-blocking). */
+ #define F_SETLKW64 10 /* Set record locking info (blocking). */
+
+-#if defined __USE_BSD || defined __USE_UNIX98
++#if defined __USE_BSD || defined __USE_UNIX98 || defined __USE_XOPEN2K8
+ # define F_GETOWN 11 /* Get owner of socket (receiver of SIGIO). */
+ # define F_SETOWN 12 /* Set owner of socket (receiver of SIGIO). */
+ #endif
+@@ -101,6 +103,10 @@
+ # define F_SETLEASE 1024 /* Set a lease. */
+ # define F_GETLEASE 1025 /* Enquire what lease is active. */
+ # define F_NOTIFY 1026 /* Request notfications on a directory. */
++# define F_SETPIPE_SZ 1031 /* Set pipe page size array. */
++# define F_GETPIPE_SZ 1032 /* Set pipe page size array. */
++#endif
++#ifdef __USE_XOPEN2K8
+ # define F_DUPFD_CLOEXEC 1030 /* Duplicate file descriptor with
+ close-on-exit set. */
+ #endif
Modified: glibc-package/branches/eglibc-2.13/debian/patches/series
===================================================================
--- glibc-package/branches/eglibc-2.13/debian/patches/series 2011-03-11 17:14:01 UTC (rev 4573)
+++ glibc-package/branches/eglibc-2.13/debian/patches/series 2011-03-11 17:15:18 UTC (rev 4574)
@@ -75,6 +75,7 @@
hppa/local-dlfptr.diff
hppa/local-longjmp-chk.diff
hppa/local-lowlevellock.diff
+hppa/submitted-fcntl_h.diff
hurd-i386/local-dl-dynamic-weak.diff
hurd-i386/local-enable-ldconfig.diff
Reply to: