diff options
author | Timo Teräs <timo.teras@iki.fi> | 2013-12-19 18:01:35 +0000 |
---|---|---|
committer | Timo Teräs <timo.teras@iki.fi> | 2013-12-19 18:01:35 +0000 |
commit | d4c94d84fa09bdd58fc0413a958966caa13c5f84 (patch) | |
tree | 35a6ce0d6199dbcde926af0da2354d851c73f0ef /main/xulrunner/fix-tools.patch | |
parent | 0a87c68d217e72e9d823fb00f11047bab47b914f (diff) | |
download | aports-d4c94d84fa09bdd58fc0413a958966caa13c5f84.tar.bz2 aports-d4c94d84fa09bdd58fc0413a958966caa13c5f84.tar.xz |
main/xulrunner: rebase musl patches, and fix musl build
Diffstat (limited to 'main/xulrunner/fix-tools.patch')
-rw-r--r-- | main/xulrunner/fix-tools.patch | 91 |
1 files changed, 14 insertions, 77 deletions
diff --git a/main/xulrunner/fix-tools.patch b/main/xulrunner/fix-tools.patch index 8a370b4ab..583ceec3e 100644 --- a/main/xulrunner/fix-tools.patch +++ b/main/xulrunner/fix-tools.patch @@ -1,4 +1,4 @@ ---- mozilla-release/tools.orig/profiler/local_debug_info_symbolizer.cc +--- mozilla-release.orig/tools/profiler/local_debug_info_symbolizer.cc +++ mozilla-release/tools/profiler/local_debug_info_symbolizer.cc @@ -3,6 +3,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this @@ -8,9 +8,9 @@ #include "PlatformMacros.h" #include "nsAutoPtr.h" ---- mozilla-release/tools.orig/profiler/platform-linux.cc +--- mozilla-release.orig/tools/profiler/platform-linux.cc +++ mozilla-release/tools/profiler/platform-linux.cc -@@ -73,7 +73,7 @@ +@@ -84,7 +84,7 @@ #define SIGNAL_SAVE_PROFILE SIGUSR2 @@ -19,16 +19,7 @@ // glibc doesn't implement gettid(2). #include <sys/syscall.h> pid_t gettid() -@@ -278,7 +278,7 @@ - // Convert ms to us and subtract 100 us to compensate delays - // occuring during signal delivery. - // TODO measure and confirm this. -- const useconds_t interval = -+ const unsigned long interval = - SamplerRegistry::sampler->interval() * 1000 - 100; - //int result = usleep(interval); - usleep(interval); ---- mozilla-release/tools.orig/profiler/platform.h +--- mozilla-release.orig/tools/profiler/platform.h +++ mozilla-release/tools/profiler/platform.h @@ -29,6 +29,8 @@ #ifndef TOOLS_PLATFORM_H_ @@ -39,68 +30,14 @@ #ifdef ANDROID #include <android/log.h> #else ---- mozilla-release/toolkit.orig/crashreporter/google-breakpad/src/common/linux/dump_symbols.cc -+++ mozilla-release/toolkit/crashreporter/google-breakpad/src/common/linux/dump_symbols.cc -@@ -45,6 +45,7 @@ - #include <sys/mman.h> - #include <sys/stat.h> - #include <unistd.h> -+#include <libgen.h> - - #include <iostream> - #include <set> ---- mozilla-release/toolkit.orig/crashreporter/google-breakpad/src/common/stabs_reader.cc -+++ mozilla-release/toolkit/crashreporter/google-breakpad/src/common/stabs_reader.cc -@@ -41,6 +41,10 @@ - - #include "common/using_std_string.h" - -+#ifndef N_UNDF -+#define N_UNDF 0 -+#endif -+ - using std::vector; - - namespace google_breakpad { ---- mozilla-release/toolkit.orig/crashreporter/google-breakpad/src/common/stabs_reader.h -+++ mozilla-release/toolkit/crashreporter/google-breakpad/src/common/stabs_reader.h -@@ -53,9 +53,6 @@ - #include <config.h> - #endif - --#ifdef HAVE_A_OUT_H --#include <a.out.h> --#endif - #ifdef HAVE_MACH_O_NLIST_H - #include <mach-o/nlist.h> - #endif ---- mozilla-release/toolkit.orig/mozapps/update/common/updatedefines.h -+++ mozilla-release/toolkit/mozapps/update/common/updatedefines.h -@@ -105,7 +105,7 @@ - - #ifdef SOLARIS - # include <sys/stat.h> --#else -+#elif defined(__GLIBC__) - # include <fts.h> - #endif - # include <dirent.h> ---- mozilla-release/toolkit.orig/mozapps/update/updater/updater.cpp -+++ mozilla-release/toolkit/mozapps/update/updater/updater.cpp -@@ -43,6 +43,7 @@ - #include <stdarg.h> - - #include <sys/types.h> -+#include <sys/param.h> - #include <sys/stat.h> - #include <fcntl.h> - #include <limits.h> -@@ -3328,7 +3329,7 @@ - return rv; - } - --#elif defined(SOLARIS) -+#elif defined(SOLARIS) || !defined(__GLIBC__) - int add_dir_entries(const NS_tchar *dirpath, ActionList *list) +--- mozilla-release/tools.orig/profiler/shared-libraries-linux.cc ++++ mozilla-release/tools/profiler/shared-libraries-linux.cc +@@ -14,7 +14,7 @@ + #include "platform.h" + #include "shared-libraries.h" + +-#if !defined(__GLIBC__) && ANDROID_VERSION < 18 ++#if defined(ANDROID) && ANDROID_VERSION < 18 + /* a crapy version of getline, because it's not included in old bionics */ + static ssize_t getline(char **lineptr, size_t *n, FILE *stream) { - int rv = OK; |