r3507 - in glibc-package/branches/eglibc-2.10/debian: . patches patches/alpha
Author: aurel32
Date: 2009-05-16 20:18:15 +0000 (Sat, 16 May 2009)
New Revision: 3507
Added:
glibc-package/branches/eglibc-2.10/debian/patches/alpha/submitted-includes.diff
Modified:
glibc-package/branches/eglibc-2.10/debian/changelog
glibc-package/branches/eglibc-2.10/debian/patches/series
Log:
Add debian/patches/alpha/submitted-includes.diff to fix FTBFS on alpha
Modified: glibc-package/branches/eglibc-2.10/debian/changelog
===================================================================
--- glibc-package/branches/eglibc-2.10/debian/changelog 2009-05-16 19:48:49 UTC (rev 3506)
+++ glibc-package/branches/eglibc-2.10/debian/changelog 2009-05-16 20:18:15 UTC (rev 3507)
@@ -68,7 +68,8 @@
* Remove debian/patches/powerpc/local-sysconf.diff, as it only concerns
kernel that are not supported anymore.
* Add debian/patches/ia64/submitted-sysconf.diff to fix sysconf() on ia64.
- * Add debian/patches/alpha/submitted-getsysstats.diff and
+ * Add debian/patches/alpha/submitted-getsysstats.diff,
+ debian/patches/alpha/submitted-includes.diff and
debian/patches/alpha/submitted-lowlevellock.diff to partially fix FTBFS
on alpha.
Added: glibc-package/branches/eglibc-2.10/debian/patches/alpha/submitted-includes.diff
===================================================================
--- glibc-package/branches/eglibc-2.10/debian/patches/alpha/submitted-includes.diff (rev 0)
+++ glibc-package/branches/eglibc-2.10/debian/patches/alpha/submitted-includes.diff 2009-05-16 20:18:15 UTC (rev 3507)
@@ -0,0 +1,66 @@
+2009-05-15 Aurelien Jarno <aurelien@aurel32.net>
+
+ * sysdeps/unix/sysv/linux/alpha/ports/getdents64.c: Adjust include path.
+ * sysdeps/unix/sysv/linux/alpha/ports/nptl/fork.c: Likewise.
+ * sysdeps/unix/sysv/linux/alpha/ports/nptl/sem_post.c: Likewise.
+ * sysdeps/unix/sysv/linux/alpha/ports/nptl/timer_create.c: Likewise.
+ * sysdeps/unix/sysv/linux/alpha/ports/nptl/timer_delete.c: Likewise.
+ * sysdeps/unix/sysv/linux/alpha/ports/nptl/timer_getoverr.c: Likewise.
+ * sysdeps/unix/sysv/linux/alpha/ports/nptl/timer_gettime.c: Likewise.
+ * sysdeps/unix/sysv/linux/alpha/ports/nptl/timer_settime.c: Likewise.
+ * sysdeps/unix/sysv/linux/alpha/ports/sysconf.c: Likewise.
+
+--- a/ports/sysdeps/unix/sysv/linux/alpha/ports/getdents64.c
++++ b/ports/sysdeps/unix/sysv/linux/alpha/ports/getdents64.c
+@@ -1 +1 @@
+-#include "../getdents64.c"
++#include <sysdeps/unix/sysv/linux/getdents64.c>
+--- a/ports/sysdeps/unix/sysv/linux/alpha/ports/nptl/fork.c
++++ b/ports/sysdeps/unix/sysv/linux/alpha/ports/nptl/fork.c
+@@ -27,4 +27,4 @@
+ CLONE_CHILD_SETTID | CLONE_CHILD_CLEARTID | SIGCHLD, \
+ NULL, NULL, &THREAD_SELF->tid, NULL)
+
+-#include "../fork.c"
++#include <sysdeps/unix/sysv/linux/fork.c>
+--- a/ports/sysdeps/unix/sysv/linux/alpha/ports/nptl/sem_post.c
++++ b/ports/sysdeps/unix/sysv/linux/alpha/ports/nptl/sem_post.c
+@@ -2,4 +2,4 @@
+ the acquire/release semantics of atomic_exchange_and_add. And even if
+ we don't do this, we should be using atomic_full_barrier or otherwise. */
+ #define __lll_rel_instr "mb"
+-#include "../sem_post.c"
++#include <nptl/sysdeps/unix/sysv/linux/sem_post.c>
+--- a/ports/sysdeps/unix/sysv/linux/alpha/ports/nptl/timer_create.c
++++ b/ports/sysdeps/unix/sysv/linux/alpha/ports/nptl/timer_create.c
+@@ -1 +1 @@
+-#include "../x86_64/timer_create.c"
++#include <nptl/sysdeps/unix/sysv/linux/x86_64/timer_create.c>
+--- a/ports/sysdeps/unix/sysv/linux/alpha/ports/nptl/timer_delete.c
++++ b/ports/sysdeps/unix/sysv/linux/alpha/ports/nptl/timer_delete.c
+@@ -1 +1 @@
+-#include "../x86_64/timer_delete.c"
++#include <nptl/sysdeps/unix/sysv/linux/x86_64/timer_delete.c>
+--- a/ports/sysdeps/unix/sysv/linux/alpha/ports/nptl/timer_getoverr.c
++++ b/ports/sysdeps/unix/sysv/linux/alpha/ports/nptl/timer_getoverr.c
+@@ -1 +1 @@
+-#include "../x86_64/timer_getoverr.c"
++#include <nptl/sysdeps/unix/sysv/linux/x86_64/timer_getoverr.c>
+--- a/ports/sysdeps/unix/sysv/linux/alpha/ports/nptl/timer_gettime.c
++++ b/ports/sysdeps/unix/sysv/linux/alpha/ports/nptl/timer_gettime.c
+@@ -1 +1 @@
+-#include "../x86_64/timer_gettime.c"
++#include <nptl/sysdeps/unix/sysv/linux/x86_64/timer_gettime.c>
+--- a/ports/sysdeps/unix/sysv/linux/alpha/ports/nptl/timer_settime.c
++++ b/ports/sysdeps/unix/sysv/linux/alpha/ports/nptl/timer_settime.c
+@@ -1 +1 @@
+-#include "../x86_64/timer_settime.c"
++#include <nptl/sysdeps/unix/sysv/linux/x86_64/timer_gettime.c>
+--- a/ports/sysdeps/unix/sysv/linux/alpha/ports/sysconf.c
++++ b/ports/sysdeps/unix/sysv/linux/alpha/ports/sysconf.c
+@@ -149,4 +149,4 @@ __sysconf (int name)
+ /* Now the generic Linux version. */
+ #undef __sysconf
+ #define __sysconf static linux_sysconf
+-#include "../sysconf.c"
++#include <sysdeps/unix/sysv/linux/sysconf.c>
Modified: glibc-package/branches/eglibc-2.10/debian/patches/series
===================================================================
--- glibc-package/branches/eglibc-2.10/debian/patches/series 2009-05-16 19:48:49 UTC (rev 3506)
+++ glibc-package/branches/eglibc-2.10/debian/patches/series 2009-05-16 20:18:15 UTC (rev 3507)
@@ -44,6 +44,7 @@
alpha/submitted-fdatasync.diff
alpha/submitted-fpu-round.diff
alpha/submitted-getsysstats.diff
+alpha/submitted-includes.diff
alpha/submitted-lowlevellock.diff
alpha/submitted-PTR_MANGLE.diff
alpha/submitted-procfs_h.diff
Reply to: