be5369a0cb
* fpc is kept at -Np0
```sh
git grep -l '^patch_args=-Np0' "srcpkgs/$1*/template" |
while read template; do
for p in ${template%/template}/patches/*; do
sed -i '
\,^[+-][+-][+-] /dev/null,b
/^[*-]\+ [0-9]\+\(,[0-9]\+\)\? [*-]\+$/b
s,^[*][*][*] ,&a/,
/^--- /{
s,\(^--- \)\(./\)*,\1a/,
s,[.][Oo][Rr][Ii][Gg]\([ /]\),\1,
s/[.][Oo][Rr][Ii][Gg]$//
s/[.]patched[.]\([^.]\)/.\1/
h
}
/^+++ -/{
g
s/^--- a/+++ b/
b
}
s,\(^+++ \)\(./\)*,\1b/,
' "$p"
done
sed -i '/^patch_args=/d' $template
done
```
34 lines
974 B
Diff
34 lines
974 B
Diff
--- a/xpcom/base/nsMemoryReporterManager.cpp 2019-03-19 17:12:20.844810044 +0100
|
|
+++ b/xpcom/base/nsMemoryReporterManager.cpp 2019-03-19 17:13:32.505133615 +0100
|
|
@@ -123,6 +123,7 @@
|
|
return GetProcSelfSmapsPrivate(aN);
|
|
}
|
|
|
|
+#ifdef __GLIBC__
|
|
# ifdef HAVE_MALLINFO
|
|
# define HAVE_SYSTEM_HEAP_REPORTER 1
|
|
static MOZ_MUST_USE nsresult SystemHeapSize(int64_t* aSizeOut) {
|
|
@@ -142,6 +143,7 @@
|
|
return NS_OK;
|
|
}
|
|
# endif
|
|
+#endif // __GLIBC__
|
|
|
|
#elif defined(__DragonFly__) || defined(__FreeBSD__) || defined(__NetBSD__) || \
|
|
defined(__OpenBSD__) || defined(__FreeBSD_kernel__)
|
|
@@ -642,6 +644,7 @@
|
|
return NS_OK;
|
|
}
|
|
|
|
+#ifdef __GLIBC__
|
|
# define HAVE_SYSTEM_HEAP_REPORTER 1
|
|
// Windows can have multiple separate heaps. During testing there were multiple
|
|
// heaps present but the non-default ones had sizes no more than a few 10s of
|
|
@@ -698,6 +701,7 @@
|
|
*aSizeOut = heapsSize;
|
|
return NS_OK;
|
|
}
|
|
+#endif // __GLIBC__
|
|
|
|
struct SegmentKind {
|
|
DWORD mState;
|