Package: iceweasel Version: 5.0-6 Severity: important Tags: patch User: debian-h...@lists.debian.org Usertags: hurd
Hi, currently, iceweasel fails to build on hurd-i386. The attached patches fix all the issues: - hurd.diff: recognize also Hurd as "linux", and disable the inclusion of a non-standard system header - debian.diff: due to the issues with our libpthread, an application dlopen'ing a library linking to pthread must link to pthread as well; so, link the simple npapi_getinfo executable to pthread as well (should not create an additional overhead) Thanks, -- Pino
--- a/ipc/chromium/src/base/third_party/nspr/prcpucfg.h +++ b/ipc/chromium/src/base/third_party/nspr/prcpucfg.h @@ -34,7 +34,7 @@ #include "base/third_party/nspr/prcpucfg_win.h" #elif defined(__APPLE__) #include "base/third_party/nspr/prcpucfg_mac.h" -#elif defined(__linux__) || defined(ANDROID) || defined(__GLIBC__) +#elif defined(__linux__) || defined(ANDROID) || defined(__GLIBC__) || defined(__GNU__) #include "base/third_party/nspr/prcpucfg_linux.h" #else #error Provide a prcpucfg.h appropriate for your platform --- a/ipc/chromium/src/build/build_config.h +++ b/ipc/chromium/src/build/build_config.h @@ -17,7 +17,7 @@ // A set of macros to use for platform detection. #if defined(__APPLE__) #define OS_MACOSX 1 -#elif defined(__linux__) || defined(ANDROID) || defined(__GLIBC__) +#elif defined(__linux__) || defined(ANDROID) || defined(__GLIBC__) || defined(__GNU__) #define OS_LINUX 1 #elif defined(_WIN32) #define OS_WIN 1 --- a/ipc/chromium/src/base/debug_util_posix.cc +++ b/ipc/chromium/src/base/debug_util_posix.cc @@ -13,8 +13,10 @@ #include <unistd.h> #ifndef ANDROID #include <execinfo.h> +#ifndef __GNU__ #include <sys/sysctl.h> #endif +#endif #include "base/basictypes.h" #include "base/eintr_wrapper.h"
--- a/debian/rules +++ b/debian/rules @@ -99,7 +99,7 @@ debian/dh/dh_xulrunner.1: debian/dh/dh_x pod2man -c Debhelper -r $(GRE_VERSION) $^ > $@ build-xulrunner/dist/bin/npapi_getinfo: debian/dh/npapi_getinfo.c - $(CC) -o $@ $< -Ibuild-xulrunner/dist/include -ldl -Wl,-rpath,\$$ORIGIN + $(CC) -o $@ $< -Ibuild-xulrunner/dist/include -ldl -lpthread -Wl,-rpath,\$$ORIGIN IN_FILES := $(wildcard debian/*.in debian/dh/*.in) define preprocess