Author: jim
Date: 2005-07-11 10:15:12 -0600 (Mon, 11 Jul 2005)
New Revision: 1010
Added:
trunk/linux-libc-headers/linux-libc-headers-2.6.12.0-sparc_conflicts-1.patch
Modified:
trunk/
Log:
[EMAIL PROTECTED]: jim | 2005-07-09 22:39:18 -0700
Updated sparc64 linux-libc-headers patch
Property changes on: trunk
___________________________________________________________________
Name: svk:merge
- cc2644d5-6cf8-0310-b111-c40428001e49:/patches:1048
+ cc2644d5-6cf8-0310-b111-c40428001e49:/patches:1052
Added:
trunk/linux-libc-headers/linux-libc-headers-2.6.12.0-sparc_conflicts-1.patch
===================================================================
---
trunk/linux-libc-headers/linux-libc-headers-2.6.12.0-sparc_conflicts-1.patch
2005-07-07 02:02:07 UTC (rev 1009)
+++
trunk/linux-libc-headers/linux-libc-headers-2.6.12.0-sparc_conflicts-1.patch
2005-07-11 16:15:12 UTC (rev 1010)
@@ -0,0 +1,31 @@
+Submitted By: Jim Gifford (patches at jg555 dot com)
+Date: 2005-07-09
+Initial Package Version: 2.6.12.0
+Origin: Jbit and MDH
+Upstream Status: Sent
+Description: Remove unistd.h, conflicts with the silo builds
+
+diff -Naur linux-libc-headers-2.6.12.0/include/asm-sparc/page.h
linux-libc-headers-2.6.12.0.orig/include/asm-sparc/page.h
+--- linux-libc-headers-2.6.12.0/include/asm-sparc/page.h 2005-07-09
22:28:38.000000000 -0700
++++ linux-libc-headers-2.6.12.0.orig/include/asm-sparc/page.h 2005-07-05
17:17:30.000000000 -0700
+@@ -8,6 +8,8 @@
+ #ifndef _SPARC_PAGE_H
+ #define _SPARC_PAGE_H
+
++#include <unistd.h>
++
+ #define PAGE_SIZE (getpagesize())
+ static __inline__ int getpageshift()
+ {
+diff -Naur linux-libc-headers-2.6.12.0/include/asm-sparc64/page.h
linux-libc-headers-2.6.12.0.orig/include/asm-sparc64/page.h
+--- linux-libc-headers-2.6.12.0/include/asm-sparc64/page.h 2005-07-09
22:28:50.000000000 -0700
++++ linux-libc-headers-2.6.12.0.orig/include/asm-sparc64/page.h
2005-07-05 17:17:43.000000000 -0700
+@@ -1,6 +1,8 @@
+ #ifndef _SPARC64_PAGE_H
+ #define _SPARC64_PAGE_H
+
++#include <unistd.h>
++
+ #define PAGE_SIZE (getpagesize())
+ static __inline__ int getpageshift()
+ {
--
http://linuxfromscratch.org/mailman/listinfo/patches
FAQ: http://www.linuxfromscratch.org/faq/
Unsubscribe: See the above information page
