commit 73a628a5cebfa6dae1fca4c5fde072376ce4d06f
Author: Georg Koppen <gk(a)torproject.org>
Date: Fri Sep 12 09:37:39 2014 +0000
Bug 12811: Add MOZ_D3DCOMPILER_DLL iff available.
It seems MOZ_D3DCOMPILER_DLL is not avilable when compiling with
mingw-w64. Trying to include it nevertheless breaks the packaging step
as `@BINPATH@/@MOZ_D3DCOMPILER_DLL@` resolves to `bin/` which results
in including all the things beginning with a `bin/` (again) which is
treated …
[View More]as an error in case they got already included.
This got fixed more or less by accident by bug 999260 which did not make
it into ESR 31 (https://hg.mozilla.org/mozilla-central/rev/8b48386fc226).
---
browser/installer/package-manifest.in | 2 ++
1 file changed, 2 insertions(+)
diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in
index 521538f..c9117cf 100644
--- a/browser/installer/package-manifest.in
+++ b/browser/installer/package-manifest.in
@@ -597,8 +597,10 @@
#ifdef MOZ_ANGLE_RENDERER
@BINPATH@/libEGL.dll
@BINPATH@/libGLESv2.dll
+#ifdef MOZ_D3DCOMPILER_DLL_PATH
@BINPATH@/@MOZ_D3DCOMPILER_DLL@
#endif
+#endif
; [Browser Chrome Files]
@BINPATH@/browser/chrome.manifest
[View Less]
commit c77ae2b34ba28808c6ada78da752a5e3e1cd8aa5
Author: Georg Koppen <gk(a)torproject.org>
Date: Mon Sep 1 13:29:52 2014 +0000
Bug 12811: Fix for Mozilla's bug 1058778.
This is the fix for https://bugzilla.mozilla.org/show_bug.cgi?id=1058778
which breaks cross-compilation with mingw-w64.
---
security/build/moz.build | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/security/build/moz.build b/security/build/moz.build
index 99fe8d6..e295613 …
[View More]100644
--- a/security/build/moz.build
+++ b/security/build/moz.build
@@ -5,10 +5,10 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
if CONFIG['MOZ_FOLD_LIBS']:
+ # Having thid if block here is needed to fix bug 1058778.
+ if CONFIG['OS_TARGET'] == 'WINNT':
+ DEFFILE = 'nss3.def'
# TODO: The library name can be changed when bug 845217 is fixed.
LIBRARY_NAME = 'nss3'
FORCE_SHARED_LIB = True
-
-if CONFIG['OS_TARGET'] == 'WINNT':
- DEFFILE = 'nss3.def'
[View Less]