Bug#584819: gcc-4.5: FTBFS on hurd-i386
reopen 584819
thanks
Oops, sorry, it looks like my patch toold is quite laxist and accepted a
not so exact patch, but buildds & such don't accept that. The attached
patch should fix the hooks content.
It also moves hurd-changes to after the snapshot barrier, now that it
only contains long-term changes.
Thanks,
Samuel
Index: debian/patches/hurd-pthread.diff
===================================================================
--- debian/patches/hurd-pthread.diff (révision 4569)
+++ debian/patches/hurd-pthread.diff (copie de travail)
@@ -58,7 +58,7 @@
# if defined(GC_FREEBSD_THREADS)
--- a/src/boehm-gc/configure.ac.orig 2009-02-07 22:30:12.000000000 +0000
+++ b/src/boehm-gc/configure.ac 2009-02-07 22:35:31.717091000 +0000
-@@ -172,6 +172,11 @@
+@@ -180,6 +180,11 @@
AM_CPPFLAGS="$AM_CPPFLAGS -pthread"
THREADLIBS=-pthread
;;
@@ -67,12 +67,12 @@
+ AC_DEFINE(_REENTRANT)
+ AC_DEFINE(THREAD_LOCAL_ALLOC)
+ ;;
- *-*-solaris*)
+ *-*-solaris2.8*)
AC_DEFINE(GC_SOLARIS_PTHREADS,1,[support for Solaris pthreads])
# Need to use alternate thread library, otherwise gctest hangs
--- a/src/boehm-gc/configure.orig 2009-02-07 22:32:34.000000000 +0000
+++ b/src/boehm-gc/configure 2009-02-07 22:35:28.065650000 +0000
-@@ -5489,6 +5489,20 @@
+@@ -14893,6 +14893,20 @@
AM_CPPFLAGS="$AM_CPPFLAGS -pthread"
THREADLIBS=-pthread
;;
@@ -90,9 +90,9 @@
+_ACEOF
+
+ ;;
- *-*-solaris*)
+ *-*-solaris2.8*)
- cat >>confdefs.h <<\_ACEOF
+ $as_echo "#define GC_SOLARIS_PTHREADS 1" >>confdefs.h
--- a/src/boehm-gc/os_dep.c.orig 2009-02-07 22:37:20.000000000 +0000
+++ b/src/boehm-gc/os_dep.c 2009-02-07 22:37:40.000000000 +0000
@@ -312,7 +312,7 @@
Index: debian/rules.patch
===================================================================
--- debian/rules.patch (révision 4569)
+++ debian/rules.patch (copie de travail)
@@ -126,7 +126,7 @@
endif
ifeq ($(DEB_TARGET_ARCH_OS),hurd)
- debian_patches += hurd-changes hurd-pthread
+ debian_patches += hurd-pthread
endif
ifeq ($(DEB_TARGET_ARCH),alpha)
@@ -174,6 +174,10 @@
debian_patches =
endif
+ifeq ($(DEB_TARGET_ARCH_OS),hurd)
+ debian_patches += hurd-changes
+endif
+
ifeq ($(PKGSOURCE),gcc-snapshot)
debian_patches += gcc-ice-hack-trunk gcc-ice-apport-trunk
else
Reply to: