Samuel Thibault, le Mon 03 Sep 2007 00:57:27 +0200, a écrit :
> > please check the 4.2
>
> It is already fine.
Ah, actually no, it's not any more thanks to the new snapshot.
> > and 4.3 branches as well.
>
> I'll have a look (I hadn't noticed that that branch got opened).
Some other patches got merged there too.
> > what is the upstream status of libjava-hurdfix.dpatch? I didn't see
> > the libltdl changes forwarded upstream.
>
> It looks like that one is not needed any more actually. I'll check that
> too.
It is not indeed.
Here are the three patches. You will notice that I actually had to fix
configure.host again: gnu* doesn't match i486-gnu.
Samuel
Index: debian/patches/libjava-hurdfix.dpatch
===================================================================
--- debian/patches/libjava-hurdfix.dpatch (révision 2471)
+++ debian/patches/libjava-hurdfix.dpatch (copie de travail)
@@ -48,57 +48,6 @@
+#endif
caseSensitive = true;
}
-diff -ur gcj-4.1.1/libjava/libltdl/acinclude.m4
gcj-4.1.1/libjava/libltdl/acinclude.m4
---- gcj-4.1.1/libjava/libltdl/acinclude.m4 2006-05-12 13:35:07.000000000
+0200
-+++ gcj-4.1.1/libjava/libltdl/acinclude.m4 2006-05-12 11:07:03.000000000
+0200
-@@ -1413,7 +1413,7 @@
- ;;
-
- # This must be Linux ELF.
--linux*)
-+linux*|gnu*)
- version_type=linux
- need_lib_prefix=no
- need_version=no
-diff -ur gcj-4.1.1/libjava/libltdl/configure
gcj-4.1.1/libjava/libltdl/configure
---- gcj-4.1.1/libjava/libltdl/configure 2006-05-12 13:35:21.000000000
+0200
-+++ gcj-4.1.1/libjava/libltdl/configure 2006-05-12 11:07:15.000000000
+0200
-@@ -8380,7 +8380,7 @@
- ;;
-
- # This must be Linux ELF.
--linux*)
-+linux*|gnu*)
- version_type=linux
- need_lib_prefix=no
- need_version=no
-@@ -12021,7 +12021,7 @@
- ;;
-
- # This must be Linux ELF.
--linux*)
-+linux*|gnu*)
- version_type=linux
- need_lib_prefix=no
- need_version=no
-@@ -15097,7 +15097,7 @@
- ;;
-
- # This must be Linux ELF.
--linux*)
-+linux*|gnu*)
- version_type=linux
- need_lib_prefix=no
- need_version=no
-@@ -17380,7 +17380,7 @@
- ;;
-
- # This must be Linux ELF.
--linux*)
-+linux*|gnu*)
- version_type=linux
- need_lib_prefix=no
- need_version=no
diff -ur gcj-4.1.1/libjava/configure.host gcj-4.1.1/libjava/configure.host
--- gcj-4.1.1/libjava/configure.host 2006-09-07 01:00:37.000000000 +0200
+++ gcj-4.1.1/libjava/configure.host 2006-09-07 01:00:37.000000000 +0200
Index: debian/patches/libjava-hurdfix.dpatch
===================================================================
--- debian/patches/libjava-hurdfix.dpatch (révision 2471)
+++ debian/patches/libjava-hurdfix.dpatch (copie de travail)
@@ -27,57 +27,6 @@
exit 0
-diff -ur gcj-4.1.1/libjava/libltdl/acinclude.m4
gcj-4.1.1/libjava/libltdl/acinclude.m4
---- gcj-4.1.1/libjava/libltdl/acinclude.m4 2006-05-12 13:35:07.000000000
+0200
-+++ gcj-4.1.1/libjava/libltdl/acinclude.m4 2006-05-12 11:07:03.000000000
+0200
-@@ -1413,7 +1413,7 @@
- ;;
-
- # This must be Linux ELF.
--linux*)
-+linux*|gnu*)
- version_type=linux
- need_lib_prefix=no
- need_version=no
-diff -ur gcj-4.1.1/libjava/libltdl/configure
gcj-4.1.1/libjava/libltdl/configure
---- gcj-4.1.1/libjava/libltdl/configure 2006-05-12 13:35:21.000000000
+0200
-+++ gcj-4.1.1/libjava/libltdl/configure 2006-05-12 11:07:15.000000000
+0200
-@@ -8380,7 +8380,7 @@
- ;;
-
- # This must be Linux ELF.
--linux*)
-+linux*|gnu*)
- version_type=linux
- need_lib_prefix=no
- need_version=no
-@@ -12021,7 +12021,7 @@
- ;;
-
- # This must be Linux ELF.
--linux*)
-+linux*|gnu*)
- version_type=linux
- need_lib_prefix=no
- need_version=no
-@@ -15097,7 +15097,7 @@
- ;;
-
- # This must be Linux ELF.
--linux*)
-+linux*|gnu*)
- version_type=linux
- need_lib_prefix=no
- need_version=no
-@@ -17380,7 +17380,7 @@
- ;;
-
- # This must be Linux ELF.
--linux*)
-+linux*|gnu*)
- version_type=linux
- need_lib_prefix=no
- need_version=no
diff -ur gcj-4.1.1/libjava/configure.host gcj-4.1.1/libjava/configure.host
--- gcj-4.1.1/libjava/configure.host 2006-09-07 01:00:37.000000000 +0200
+++ gcj-4.1.1/libjava/configure.host 2006-09-07 01:00:37.000000000 +0200
@@ -85,52 +34,8 @@
esac
case "${host}" in
-- *linux*|*-kfreebsd*-gnu)
-+ *linux*|*-kfreebsd*-gnu|*gnu*)
+- *linux*|*-kfreebsd*-gnu|gnu*)
++ *linux*|*-kfreebsd*-gnu|*-gnu*)
use_libgcj_bc=yes
;;
*)
-Index: gcc-4.1.1/libjava/java/lang/natPosixProcess.cc
-===================================================================
---- gcc-4.1.1/libjava/java/lang/natPosixProcess.cc (révision 127274)
-+++ gcc-4.1.1/libjava/java/lang/natPosixProcess.cc (copie de travail)
-@@ -110,7 +110,11 @@
- // sigwait() on SIGCHLD. The information passed is ignored as it
- // will be recovered by the waitpid() call.
- static void
-+#ifdef SA_SIGINFO
- sigchld_handler (int sig, siginfo_t *si, void *third)
-+#else
-+sigchld_handler (int sig)
-+#endif
- {
- if (PosixProcess$ProcessManager::nativeData != NULL)
- {
-@@ -121,9 +125,11 @@
- if (pmi->old_sigaction.sa_handler != SIG_DFL
- && pmi->old_sigaction.sa_handler != SIG_IGN)
- {
-+#ifdef SA_SIGINFO
- if ((pmi->old_sigaction.sa_flags & SA_SIGINFO) != 0)
- pmi->old_sigaction.sa_sigaction(sig, si, third);
- else
-+#endif
- (*pmi->old_sigaction.sa_handler)(sig);
- }
- }
-@@ -156,9 +162,15 @@
- struct sigaction sa;
- memset (&sa, 0, sizeof (sa));
-
-+#ifdef SA_SIGINFO
- sa.sa_sigaction = sigchld_handler;
- // We only want signals when the things exit.
- sa.sa_flags = SA_NOCLDSTOP | SA_SIGINFO;
-+#else
-+ sa.sa_handler = sigchld_handler;
-+ // We only want signals when the things exit.
-+ sa.sa_flags = SA_NOCLDSTOP;
-+#endif
-
- if (-1 == sigaction (SIGCHLD, &sa, &pmi->old_sigaction))
- goto error;
Index: debian/patches/hurd-changes.dpatch
===================================================================
--- debian/patches/hurd-changes.dpatch (révision 2471)
+++ debian/patches/hurd-changes.dpatch (copie de travail)
@@ -28,39 +28,10 @@
# DP:
# DP: Define MAXPATHLEN and PATH_MAX.
---- gcc/ada/adaint.c.orig 2005-11-15 14:52:31.000000000 +0100
-+++ gcc/ada/adaint.c 2006-12-10 12:28:46.000000000 +0100
-@@ -272,6 +272,10 @@
- #include <sys/param.h>
- #endif
-
-+#ifndef MAXPATHLEN
-+#define MAXPATHLEN 4096
-+#endif
-+
- #ifdef MAXPATHLEN
- #define GNAT_MAX_PATH_LEN MAXPATHLEN
- #else
---- gcc/config/i386/gnu.h.orig 2004-09-08 02:17:19.000000000 +0200
-+++ gcc/config/i386/gnu.h 2006-12-10 12:28:45.000000000 +0100
-@@ -17,7 +17,7 @@
- while (0)
-
- #undef CPP_SPEC
--#define CPP_SPEC "%{posix:-D_POSIX_SOURCE} %{bsd:-D_BSD_SOURCE}"
-+#define CPP_SPEC "%{posix:-D_POSIX_SOURCE} %{bsd:-D_BSD_SOURCE}
%{pthread:-D_REENTRANT}"
-
- #undef CC1_SPEC
- #define CC1_SPEC "%(cc1_cpu)"
--- gcc/config/gnu.h.orig 2004-07-05 21:49:20.000000000 +0200
+++ gcc/config/gnu.h 2006-12-10 12:28:45.000000000 +0100
-@@ -6,11 +6,12 @@
+@@ -6,7 +6,8 @@
- /* Default C library spec. Use -lbsd-compat for gcc -bsd. */
- #undef LIB_SPEC
--#define LIB_SPEC "%{bsd:-lbsd-compat} %{!p:%{!pg:-lc}}%{p:-lc_p}%{pg:-lc_p}"
-+#define LIB_SPEC "%{pthread:-lpthread} %{bsd:-lbsd-compat}
%{!p:%{!pg:-lc}}%{p:-lc_p}%{pg:-lc_p}"
-
/* Standard include directory. In GNU, "/usr" is a four-letter word. */
#undef STANDARD_INCLUDE_DIR
-#define STANDARD_INCLUDE_DIR "/include"
Index: debian/patches/pr28102.dpatch
===================================================================
--- debian/patches/pr28102.dpatch (révision 2471)
+++ debian/patches/pr28102.dpatch (copie de travail)
@@ -31,11 +31,15 @@
===================================================================
--- gcc/config/i386/gnu.h (revision 115472)
+++ gcc/config/i386/gnu.h (working copy)
-@@ -36,3 +36,5 @@
+@@ -36,3 +36,9 @@
/* FIXME: Is a Hurd-specific fallback mechanism necessary? */
#undef MD_UNWIND_SUPPORT
+
-+#undef TARGET_C99_FUNCTIONS /* config.gcc includes i386/linux.h. */
++/* config.gcc includes i386/linux.h. */
++#undef TARGET_C99_FUNCTIONS
++#define TARGET_C99_FUNCTIONS 1
++#undef TARGET_HAS_SINCOS
++#define TARGET_HAS_SINCOS 1
Index: debian/patches/libjava-hurdfix.dpatch
===================================================================
--- debian/patches/libjava-hurdfix.dpatch (révision 2468)
+++ debian/patches/libjava-hurdfix.dpatch (copie de travail)
@@ -27,57 +27,6 @@
exit 0
-diff -ur gcj-4.1.1/libjava/libltdl/acinclude.m4
gcj-4.1.1/libjava/libltdl/acinclude.m4
---- gcj-4.1.1/libjava/libltdl/acinclude.m4 2006-05-12 13:35:07.000000000
+0200
-+++ gcj-4.1.1/libjava/libltdl/acinclude.m4 2006-05-12 11:07:03.000000000
+0200
-@@ -1413,7 +1413,7 @@
- ;;
-
- # This must be Linux ELF.
--linux*)
-+linux*|gnu*)
- version_type=linux
- need_lib_prefix=no
- need_version=no
-diff -ur gcj-4.1.1/libjava/libltdl/configure
gcj-4.1.1/libjava/libltdl/configure
---- gcj-4.1.1/libjava/libltdl/configure 2006-05-12 13:35:21.000000000
+0200
-+++ gcj-4.1.1/libjava/libltdl/configure 2006-05-12 11:07:15.000000000
+0200
-@@ -8380,7 +8380,7 @@
- ;;
-
- # This must be Linux ELF.
--linux*)
-+linux*|gnu*)
- version_type=linux
- need_lib_prefix=no
- need_version=no
-@@ -12021,7 +12021,7 @@
- ;;
-
- # This must be Linux ELF.
--linux*)
-+linux*|gnu*)
- version_type=linux
- need_lib_prefix=no
- need_version=no
-@@ -15097,7 +15097,7 @@
- ;;
-
- # This must be Linux ELF.
--linux*)
-+linux*|gnu*)
- version_type=linux
- need_lib_prefix=no
- need_version=no
-@@ -17380,7 +17380,7 @@
- ;;
-
- # This must be Linux ELF.
--linux*)
-+linux*|gnu*)
- version_type=linux
- need_lib_prefix=no
- need_version=no
diff -ur gcj-4.1.1/libjava/configure.host gcj-4.1.1/libjava/configure.host
--- gcj-4.1.1/libjava/configure.host 2006-09-07 01:00:37.000000000 +0200
+++ gcj-4.1.1/libjava/configure.host 2006-09-07 01:00:37.000000000 +0200
@@ -85,8 +34,8 @@
esac
case "${host}" in
-- *linux*|*-kfreebsd*-gnu)
-+ *linux*|*-kfreebsd*-gnu|*gnu*)
+- *linux*|*-kfreebsd*-gnu|gnu*)
++ *linux*|*-kfreebsd*-gnu|*-gnu*)
use_libgcj_bc=yes
;;
*)
