[Glibc-bsd-commits] r5773 - in trunk/glibc-ports: . kfreebsd/mips/mips32 kfreebsd/mips/sys

[aurel32 at alioth.debian.org]

Author: aurel32
Date: 2015-09-13 18:56:30 +0000 (Sun, 13 Sep 2015)
New Revision: 5773

Modified:
   trunk/glibc-ports/gen_sysdep_patch.sh
   trunk/glibc-ports/kfreebsd/mips/mips32/sysdep.h
   trunk/glibc-ports/kfreebsd/mips/sys/tas.h
Log:
Move glibc files out of ports/ to be compatible with glibc 2.21


Modified: trunk/glibc-ports/gen_sysdep_patch.sh
===================================================================
--- trunk/glibc-ports/gen_sysdep_patch.sh	2015-09-06 19:29:10 UTC (rev 5772)
+++ trunk/glibc-ports/gen_sysdep_patch.sh	2015-09-13 18:56:30 UTC (rev 5773)
@@ -4,12 +4,12 @@
 
 # sysdeps dir
 tmp=`mktemp -d`
-mkdir -p ${tmp}/b/ports/sysdeps/unix/bsd/bsd4.4
-cp -a kfreebsd ${tmp}/b/ports/sysdeps/unix/bsd/bsd4.4/
-(cd ${tmp} && diff -x .svn -Nurd null b/ports ) | \
+mkdir -p ${tmp}/b/sysdeps/unix/bsd/bsd4.4
+cp -a kfreebsd ${tmp}/b/sysdeps/unix/bsd/bsd4.4/
+(cd ${tmp} && diff -x .svn -Nurd null b/ ) | \
    sed -e "sz^--- null/sysdeps/unix/bsd/bsd4.4/kfreebsd/.*z--- /dev/nullz" \
        -e "\z^diff -x .svn -Nurd null/sysdeps/unix/bsd/bsd4.4/kfreebsd/.*zd" \
-       -e "\z^+++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/zsz\t20[0-9][0-9].*zz" \
+       -e "\z^+++ b/sysdeps/unix/bsd/bsd4.4/kfreebsd/zsz\t20[0-9][0-9].*zz" \
    > sysdeps.diff
 rm -rf ${tmp}
 

Modified: trunk/glibc-ports/kfreebsd/mips/mips32/sysdep.h
===================================================================
--- trunk/glibc-ports/kfreebsd/mips/mips32/sysdep.h	2015-09-06 19:29:10 UTC (rev 5772)
+++ trunk/glibc-ports/kfreebsd/mips/mips32/sysdep.h	2015-09-13 18:56:30 UTC (rev 5773)
@@ -22,7 +22,7 @@
 
 /* This drags in __syscall_error, keep in sync with Makefile in
    this directory.  */
-#include <ports/sysdeps/unix/sysv/linux/mips/mips32/sysdep.h>
+#include <sysdeps/unix/sysv/linux/mips/mips32/sysdep.h>
 
 /* Default INLINE_SYSCALL works but is buggy for 64-bit arguments
    (breaks mmap, lseek...).  */

Modified: trunk/glibc-ports/kfreebsd/mips/sys/tas.h
===================================================================
--- trunk/glibc-ports/kfreebsd/mips/sys/tas.h	2015-09-06 19:29:10 UTC (rev 5772)
+++ trunk/glibc-ports/kfreebsd/mips/sys/tas.h	2015-09-13 18:56:30 UTC (rev 5773)
@@ -1,2 +1,2 @@
 /* workaround for http://sources.redhat.com/bugzilla/show_bug.cgi?id=12298 */
-#include <ports/sysdeps/unix/sysv/linux/mips/sys/tas.h>
+#include <sysdeps/unix/sysv/linux/mips/sys/tas.h>