Bug#314314: #314314 mozilla: FTBFS on hurd-i386: Needs porting [patch]
Samuel Thibault
samuel.thibault at ens-lyon.org
Mon Feb 23 00:59:33 UTC 2009
tags 314314 + patch
thanks
Hello,
Andreas Metzler, le Mon 25 Dec 2006 14:36:23 +0100, a écrit :
> reassign 314314 iceape
> # since afaict iceape has not built successfully on hurd I assume this
> # still applies.
> found 314314 1.0.6-1
> retitle 314314 FTBFS on hurd-i386: Needs porting
Yes, here is a patch.
Samuel
-------------- next part --------------
--- debian/patches/38_kbsd.dpatch.orig 2009-02-02 01:57:45.000000000 +0000
+++ debian/patches/38_kbsd.dpatch 2009-02-02 01:57:48.000000000 +0000
@@ -42,11 +42,12 @@
diff -ur mozilla/directory/c-sdk/configure.in mozilla/directory/c-sdk/configure.in
--- mozilla/directory/c-sdk/configure.in 2006-02-23 00:58:25.000000000 +0100
+++ mozilla/directory/c-sdk/configure.in 2006-11-20 23:08:37.000000000 +0100
-@@ -560,6 +560,7 @@
+@@ -560,6 +560,8 @@
OS_TEST="${target_cpu}"
case "${target_os}" in
linux*) OS_ARCH=Linux ;;
+ kfreebsd*-gnu) OS_ARCH=GNU_kFreeBSD ;;
++ gnu*) OS_ARCH=GNU ;;
solaris*) OS_ARCH=SunOS OS_RELEASE=5 ;;
mingw*) OS_ARCH=WINNT ;;
darwin*) OS_ARCH=Darwin ;;
@@ -55,7 +56,7 @@
;;
-*-linux*)
-+*-linux*|*-kfreebsd*-gnu)
++*-linux*|*-kfreebsd*-gnu|*-gnu*)
if test -z "$USE_NSPR_THREADS"; then
USE_PTHREADS=1
IMPL_STRATEGY=_PTH
@@ -79,7 +80,7 @@
fi
;;
- *-linux*)
-+ *-linux*|*-kfreebsd*-gnu)
++ *-linux*|*-kfreebsd*-gnu|*-gnu*)
AC_DEFINE(_REENTRANT)
;;
esac
@@ -88,18 +89,19 @@
fi
;;
-*-linux*)
-+*-linux*|*-kfreebsd*-gnu)
++*-linux*|*-kfreebsd*-gnu|*-gnu*)
if test -n "$USE_NSPR_THREADS"; then
AC_DEFINE(_PR_LOCAL_THREADS_ONLY)
fi
diff -ur mozilla/directory/c-sdk/configure mozilla/directory/c-sdk/configure
--- mozilla/directory/c-sdk/configure 2006-02-23 00:58:25.000000000 +0100
+++ mozilla/directory/c-sdk/configure 2006-11-20 23:08:42.000000000 +0100
-@@ -2753,6 +2753,7 @@
+@@ -2753,6 +2753,8 @@
OS_TEST="${target_cpu}"
case "${target_os}" in
linux*) OS_ARCH=Linux ;;
+ kfreebsd*-gnu) OS_ARCH=GNU_kFreeBSD ;;
++ gnu*) OS_ARCH=GNU ;;
solaris*) OS_ARCH=SunOS OS_RELEASE=5 ;;
mingw*) OS_ARCH=WINNT ;;
darwin*) OS_ARCH=Darwin ;;
@@ -108,7 +110,7 @@
;;
-*-linux*)
-+*-linux*|*-kfreebsd*-gnu)
++*-linux*|*-kfreebsd*-gnu|*-gnu*)
if test -z "$USE_NSPR_THREADS"; then
USE_PTHREADS=1
IMPL_STRATEGY=_PTH
@@ -138,7 +140,7 @@
fi
;;
- *-linux*)
-+ *-linux*|*-kfreebsd*-gnu)
++ *-linux*|*-kfreebsd*-gnu|*-gnu*)
cat >> confdefs.h <<\EOF
#define _REENTRANT 1
EOF
@@ -147,7 +149,7 @@
fi
;;
-*-linux*)
-+*-linux*|*-kfreebsd*-gnu)
++*-linux*|*-kfreebsd*-gnu|*-gnu*)
if test -n "$USE_NSPR_THREADS"; then
cat >> confdefs.h <<\EOF
#define _PR_LOCAL_THREADS_ONLY 1
@@ -257,7 +259,7 @@
#if defined(__hpux) || defined(_AIX) || defined(OSF1) || defined(DARWIN) || \
defined(BEOS) || defined(FREEBSD) || defined(BSDI) || defined(VMS) || \
- defined(OPENBSD) || defined(NETBSD)
-+ defined(OPENBSD) || defined(NETBSD) || defined(__FreeBSD_kernel__)
++ defined(OPENBSD) || defined(NETBSD) || defined(__FreeBSD_kernel__) || defined(__GNU__)
#define EDEADLOCK -1
#endif
@@ -450,7 +452,7 @@
#if defined(SCO) || defined(UNIXWARE) || defined(BSDI) || defined(FREEBSD) \
- || defined(NETBSD) || defined(NTO) || defined(DARWIN) || defined(OPENBSD)
+ || defined(NETBSD) || defined(NTO) || defined(DARWIN) || defined(OPENBSD) \
-+ || defined(__FreeBSD_kernel__) || defined(__NetBSD_kernel__)
++ || defined(__FreeBSD_kernel__) || defined(__NetBSD_kernel__) || defined(__GNU__)
#include <sys/times.h>
#define getdtablesize() sysconf(_SC_OPEN_MAX)
@@ -505,11 +507,12 @@
diff -urN mozilla/configure.in mozilla/configure.in
--- mozilla/configure.in 2006-11-20 22:20:44.000000000 +0100
+++ mozilla/configure.in 2006-11-20 22:10:27.000000000 +0100
-@@ -812,6 +812,7 @@
+@@ -812,6 +812,8 @@
OS_TEST="${target_cpu}"
case "${target_os}" in
linux*) OS_ARCH=Linux ;;
+ kfreebsd*-gnu) OS_ARCH=GNU_kFreeBSD ;;
++ gnu*) OS_ARCH=GNU ;;
solaris*) OS_ARCH=SunOS OS_RELEASE=5 ;;
mingw*) OS_ARCH=WINNT ;;
wince*) OS_ARCH=WINCE ;;
@@ -518,7 +521,7 @@
;;
-*-linux*)
-+*-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}"
@@ -527,7 +530,7 @@
dnl ========================================================
case "$target" in
- *-linux*)
-+ *-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*)
@@ -536,7 +539,7 @@
;;
- *-*-linux*)
-+ *-*-linux*|*-*-kfreebsd*-gnu)
++ *-*-linux*|*-*-kfreebsd*-gnu|*-gnu*)
AC_DEFINE(_REENTRANT)
;;
--- debian/patches/80_uname.dpatch.orig 2009-02-02 02:04:02.000000000 +0000
+++ debian/patches/80_uname.dpatch 2009-02-02 02:04:44.883762000 +0000
@@ -14,13 +14,14 @@
--- xulrunner/configure.in 2006-08-09 10:26:00.000000000 +0200
+++ xulrunner/configure.in 2006-08-09 10:31:25.000000000 +0200
-@@ -811,18 +811,26 @@
+@@ -811,19 +811,28 @@
OS_RELEASE=
OS_TEST="${target_cpu}"
case "${target_os}" in
- linux*) OS_ARCH=Linux ;;
+ linux*) OS_ARCH=Linux OS_TARGET=Linux;;
kfreebsd*-gnu) OS_ARCH=GNU_kFreeBSD ;;
+ gnu*) OS_ARCH=GNU ;;
solaris*) OS_ARCH=SunOS OS_RELEASE=5 ;;
mingw*) OS_ARCH=WINNT ;;
wince*) OS_ARCH=WINCE ;;
@@ -37,6 +38,7 @@
+ case "${host_os}" in
+ linux*) OS_ARCH=Linux OS_TARGET=Linux;;
+ kfreebsd*-gnu) OS_ARCH=GNU_kFreeBSD ;;
++ gnu*) OS_ARCH=GNU ;;
+ solaris*) OS_ARCH=SunOS OS_RELEASE=5 ;;
+ mingw*) OS_ARCH=WINNT ;;
+ wince*) OS_ARCH=WINCE ;;
--- config/rules.mk.orig 2009-02-02 02:17:59.000000000 +0000
+++ config/rules.mk 2009-02-02 02:18:11.000000000 +0000
@@ -515,6 +515,14 @@
endif
#
+# GNU doesn't have path length limitation
+#
+
+ifeq ($(OS_ARCH),GNU)
+OS_CPPFLAGS += -DPATH_MAX=1024 -DMAXPATHLEN=1024
+endif
+
+#
# MINGW32
#
ifeq ($(OS_ARCH),WINNT)
--- debian/patches/99_configure.dpatch.orig 2009-02-02 02:54:25.018183000 +0000
+++ debian/patches/99_configure.dpatch 2009-02-02 02:55:15.363560000 +0000
@@ -1529,13 +1529,14 @@
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
-@@ -5137,17 +5041,26 @@ if test -n "$CROSS_COMPILE"; then
+@@ -5137,17 +5041,28 @@ if test -n "$CROSS_COMPILE"; then
OS_RELEASE=
OS_TEST="${target_cpu}"
case "${target_os}" in
- linux*) OS_ARCH=Linux ;;
+ linux*) OS_ARCH=Linux OS_TARGET=Linux;;
+ kfreebsd*-gnu) OS_ARCH=GNU_kFreeBSD ;;
++ gnu*) OS_ARCH=GNU ;;
solaris*) OS_ARCH=SunOS OS_RELEASE=5 ;;
mingw*) OS_ARCH=WINNT ;;
wince*) OS_ARCH=WINCE ;;
@@ -1552,6 +1553,7 @@
+ case "${host_os}" in
+ linux*) OS_ARCH=Linux OS_TARGET=Linux;;
+ kfreebsd*-gnu) OS_ARCH=GNU_kFreeBSD ;;
++ gnu*) OS_ARCH=GNU ;;
+ solaris*) OS_ARCH=SunOS OS_RELEASE=5 ;;
+ mingw*) OS_ARCH=WINNT ;;
+ wince*) OS_ARCH=WINCE ;;
@@ -1688,7 +1690,7 @@
;;
-*-linux*)
-+*-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}"
@@ -1866,7 +1868,7 @@
case "$target" in
- *-linux*)
-+ *-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*)
@@ -3222,7 +3224,7 @@
;;
- *-*-linux*)
-+ *-*-linux*|*-*-kfreebsd*-gnu)
++ *-*-linux*|*-*-kfreebsd*-gnu|gnu*)
cat >> confdefs.h <<\EOF
#define _REENTRANT 1
EOF
More information about the pkg-mozilla-maintainers
mailing list