Bug#314314: #314314 mozilla: FTBFS on hurd-i386: Needs porting [patch]

[Samuel Thibault]

Hello,

Here is a patch to fix the last missing bits of iceape for hurd-i386.

Samuel
-------------- next part --------------
--- iceape-2.0/mozilla/js/src/configure.in.origin	2009-11-13 08:53:29.000000000 +0000
+++ iceape-2.0/mozilla/js/src/configure.in	2009-11-13 08:57:54.000000000 +0000
@@ -925,6 +925,7 @@
     case "${target_os}" in
         linux*)       OS_ARCH=Linux OS_TARGET=Linux ;;
         kfreebsd*-gnu) OS_ARCH=GNU_kFreeBSD OS_TARGET=GNU_kFreeBSD ;;
+        gnu*)         OS_ARCH=GNU ;;
         solaris*)     OS_ARCH=SunOS OS_RELEASE=5 ;;
         mingw*)       OS_ARCH=WINNT ;;
         wince*)       OS_ARCH=WINCE ;;
@@ -1526,7 +1527,7 @@
     LIBXUL_LIBS='$(XPCOM_FROZEN_LDOPTS) $(LIBXUL_DIST)/bin/XUL -lobjc'
     ;;
 
-*-linux*|*-kfreebsd*-gnu)
+*-linux*|*-kfreebsd*-gnu|*-gnu*)
     HOST_CFLAGS="$HOST_CFLAGS -DXP_UNIX"
     HOST_NSPR_MDCPUCFG='\"md/_linux.cfg\"'
     HOST_OPTIMIZE_FLAGS="${HOST_OPTIMIZE_FLAGS=-O3}"
@@ -2424,7 +2425,7 @@
 dnl = Flags to strip unused symbols from .so components
 dnl ========================================================
 case "$target" in
-    *-linux*|*-kfreebsd*-gnu)
+    *-linux*|*-kfreebsd*-gnu|*-gnu*)
         MOZ_COMPONENTS_VERSION_SCRIPT_LDFLAGS='-Wl,--version-script -Wl,$(BUILD_TOOLS)/gnu-ld-scripts/components-version-script'
         ;;
     *-solaris*)
@@ -2507,6 +2508,9 @@
 freebsd*|kfreebsd*)
     AC_DEFINE(AVMPLUS_UNIX)
     ;;
+gnu*)
+    AC_DEFINE(AVMPLUS_UNIX)
+    ;;
 *cygwin*|*mingw*|*mks*|*msvc*|*wince)
     AC_DEFINE(AVMPLUS_WIN32)
     ;;
@@ -3096,7 +3100,7 @@
 			fi
 			;;
 
-	    *-*-linux*|*-*-kfreebsd*-gnu)
+	    *-*-linux*|*-*-kfreebsd*-gnu|*-*-gnu*)
 			AC_DEFINE(_REENTRANT) 
 			;;
 
--- iceape-2.0/mozilla/js/src/configure.orogin	2009-11-13 08:53:36.000000000 +0000
+++ iceape-2.0/mozilla/js/src/configure	2009-11-13 08:59:09.000000000 +0000
@@ -4695,6 +4695,7 @@
     case "${target_os}" in
         linux*)       OS_ARCH=Linux OS_TARGET=Linux ;;
         kfreebsd*-gnu) OS_ARCH=GNU_kFreeBSD OS_TARGET=GNU_kFreeBSD ;;
+        gnu*)         OS_ARCH=GNU;;
         solaris*)     OS_ARCH=SunOS OS_RELEASE=5 ;;
         mingw*)       OS_ARCH=WINNT ;;
         wince*)       OS_ARCH=WINCE ;;
@@ -5436,7 +5437,7 @@
     LIBXUL_LIBS='$(XPCOM_FROZEN_LDOPTS) $(LIBXUL_DIST)/bin/XUL -lobjc'
     ;;
 
-*-linux*|*-kfreebsd*-gnu)
+*-linux*|*-kfreebsd*-gnu|*-gnu*)
     HOST_CFLAGS="$HOST_CFLAGS -DXP_UNIX"
     HOST_NSPR_MDCPUCFG='\"md/_linux.cfg\"'
     HOST_OPTIMIZE_FLAGS="${HOST_OPTIMIZE_FLAGS=-O3}"
@@ -6775,7 +6776,7 @@
 esac
 
 case "$target" in
-    *-linux*|*-kfreebsd*-gnu)
+    *-linux*|*-kfreebsd*-gnu|*-gnu*)
         MOZ_COMPONENTS_VERSION_SCRIPT_LDFLAGS='-Wl,--version-script -Wl,$(BUILD_TOOLS)/gnu-ld-scripts/components-version-script'
         ;;
     *-solaris*)
@@ -6890,6 +6891,12 @@
 EOF
 
     ;;
+gnu*)
+    cat >> confdefs.h <<\EOF
+#define AVMPLUS_UNIX 1
+EOF
+
+    ;;
 *cygwin*|*mingw*|*mks*|*msvc*|*wince)
     cat >> confdefs.h <<\EOF
 #define AVMPLUS_WIN32 1
@@ -9468,7 +9475,7 @@
 			fi
 			;;
 
-	    *-*-linux*|*-*-kfreebsd*-gnu)
+	    *-*-linux*|*-*-kfreebsd*-gnu|*-*-gnu*)
 			cat >> confdefs.h <<\EOF
 #define _REENTRANT 1
 EOF
--- iceape-2.0/mozilla/media/libsydneyaudio/src/Makefile.in.origin	2009-11-14 02:25:34.000000000 +0000
+++ iceape-2.0/mozilla/media/libsydneyaudio/src/Makefile.in	2009-11-14 02:25:36.000000000 +0000
@@ -45,7 +45,7 @@
 LIBRARY_NAME	= sydneyaudio
 FORCE_STATIC_LIB= 1
 
-ifneq (,$(filter DragonFly FreeBSD GNU_% NetBSD OpenBSD,$(OS_ARCH)))
+ifneq (,$(filter DragonFly FreeBSD GNU GNU_% NetBSD OpenBSD,$(OS_ARCH)))
 CSRCS		= \
 		sydney_audio_oss.c \
 		$(NULL)
--- iceape-2.0/directory/c-sdk/configure.in.orig	2009-11-17 00:12:35.000000000 +0000
+++ iceape-2.0/directory/c-sdk/configure.in	2009-11-17 00:13:08.000000000 +0000
@@ -1487,7 +1487,7 @@
 	esac
     ;;
 
-*-linux*|*-kfreebsd*-gnu)
+*-linux*|*-kfreebsd*-gnu|*-gnu*)
     if test -z "$USE_NSPR_THREADS"; then
         USE_PTHREADS=1
     fi
--- iceape-2.0/directory/c-sdk/configure.orig	2009-11-17 00:13:17.000000000 +0000
+++ iceape-2.0/directory/c-sdk/configure	2009-11-17 00:13:30.000000000 +0000
@@ -4616,7 +4616,7 @@
 	esac
     ;;
 
-*-linux*|*-kfreebsd*-gnu)
+*-linux*|*-kfreebsd*-gnu|*-gnu*)
     if test -z "$USE_NSPR_THREADS"; then
         USE_PTHREADS=1
     fi