From d47cc4b2af9e7d253fd784aa31896fdf9cd354f8 Mon Sep 17 00:00:00 2001 From: ensc Date: Mon, 7 Mar 2005 00:25:59 +0000 Subject: [PATCH] synced hppa's with recent kernel --- dietlibc-0.28-hppa.patch | 59 ++++++++++++++++++++++++++++++++++++++++ dietlibc.spec | 2 ++ 2 files changed, 61 insertions(+) create mode 100644 dietlibc-0.28-hppa.patch diff --git a/dietlibc-0.28-hppa.patch b/dietlibc-0.28-hppa.patch new file mode 100644 index 0000000..7edba97 --- /dev/null +++ b/dietlibc-0.28-hppa.patch @@ -0,0 +1,59 @@ +diff -rup dietlibc-0.28.hppa/include/fcntl.h dietlibc-0.28/include/fcntl.h +--- dietlibc-0.28.hppa/include/fcntl.h 2005-03-07 01:11:46.000000000 +0100 ++++ dietlibc-0.28/include/fcntl.h 2005-03-07 01:21:07.000000000 +0100 +@@ -501,13 +501,21 @@ struct flock64 { + #define O_CREAT 00000400 /* not fcntl */ + #define O_TRUNC 00001000 /* not fcntl */ + #define O_EXCL 00002000 /* not fcntl */ ++#define O_LARGEFILE 00004000 + #define O_ASYNC 00020000 + #define O_SYNC 00100000 + #define O_NONBLOCK 00200004 /* HPUX has separate NDELAY & NONBLOCK */ + #define O_NDELAY O_NONBLOCK + #define O_NOCTTY 00400000 /* not fcntl */ ++#define O_DSYNC 01000000 /* HPUX only */ ++#define O_RSYNC 02000000 /* HPUX only */ ++#define O_NOATIME 04000000 + #define O_DIRECTORY 00010000 + ++#define O_DIRECT 00040000 /* direct disk access hint - currently ignored */ ++#define O_NOFOLLOW 00000200 /* don't follow links */ ++#define O_INVISIBLE 04000000 /* invisible I/O, for DMAPI/XDSM */ ++ + #define F_DUPFD 0 /* Duplicate file descriptor. */ + #define F_GETFD 1 /* Get file descriptor flags. */ + #define F_SETFD 2 /* Set file descriptor flags. */ +@@ -521,6 +529,11 @@ struct flock64 { + #define F_SETLK64 9 /* Set record locking info (non-blocking). */ + #define F_SETLKW64 10 /* Set record locking info (blocking). */ + ++#define F_GETOWN 11 /* for sockets. */ ++#define F_SETOWN 12 /* for sockets. */ ++#define F_SETSIG 13 /* for sockets. */ ++#define F_GETSIG 14 /* for sockets. */ ++ + #define FD_CLOEXEC 1 /* actually anything with low bit set goes */ + + #define F_RDLCK 1 /* Read lock. */ +@@ -530,6 +543,21 @@ struct flock64 { + #define F_EXLCK 4 /* or 3 */ + #define F_SHLCK 8 /* or 4 */ + ++/* for leases */ ++#define F_INPROGRESS 16 ++ ++/* operations for bsd flock(), also used by the kernel implementation */ ++#define LOCK_SH 1 /* shared lock */ ++#define LOCK_EX 2 /* exclusive lock */ ++#define LOCK_NB 4 /* or'd with one of the above to prevent ++ blocking */ ++#define LOCK_UN 8 /* remove lock */ ++ ++#define LOCK_MAND 32 /* This is a mandatory flock */ ++#define LOCK_READ 64 /* ... Which allows concurrent read operations */ ++#define LOCK_WRITE 128 /* ... Which allows concurrent write operations */ ++#define LOCK_RW 192 /* ... Which allows concurrent read & write ops */ ++ + struct flock + { + short int l_type; /* Type of lock: F_RDLCK, F_WRLCK, or F_UNLCK. */ diff --git a/dietlibc.spec b/dietlibc.spec index 6a871b1..f5b7f14 100644 --- a/dietlibc.spec +++ b/dietlibc.spec @@ -45,6 +45,7 @@ Source1: http://www.fefe.de/dietlibc/%NAME-%version.tar.bz2.sig Patch0: dietlibc-0.28-gcc4.patch Patch1: dietlibc-0.28-setpriority.patch Patch2: dietlibc-0.28-ppc.patch +Patch3: dietlibc-0.28-hppa.patch BuildRoot: %_tmppath/%name-%version-buildroot %{?with_dyn:Requires: dietlibc-lib = %version-%release} @@ -77,6 +78,7 @@ This package contains the dynamic libraries for dietlibc. %patch0 -p1 -b .gcc4 %patch1 -p1 -b .nice %patch2 -p1 -b .ppc +%patch3 -p1 -b .hppa ## only for 0.28; remove it in 0.29 sed -i -e 's!LD_RUN_PATH= !env -u LD_RUN_PATH !' Makefile