commit 7b9ee2edad86d23bca2ecef5b5ae0a6adae7bd74 Author: Nicolas Vigier boklm@torproject.org Date: Sat Nov 22 23:28:58 2014 +0100

instantbird: add nspr patch to fix mingw build --- projects/instantbird/build | 7 ++++ projects/instantbird/config | 2 ++ projects/instantbird/fix-mingw-build.nsprpatch | 44 ++++++++++++++++++++++++ 3 files changed, 53 insertions(+)

diff --git a/projects/instantbird/build b/projects/instantbird/build index 4233a88..353961c 100644 --- a/projects/instantbird/build +++ b/projects/instantbird/build @@ -46,6 +46,13 @@ then done fi cd .. + +[% IF c("var/windows") %] +cd mozilla/nsprpub +patch -p1 < $rootdir/fix-mingw-build.nsprpatch +cd ../.. +[% END %] + cp ../[% c('input_files_by_name/mozconfig') %] .mozconfig ./mozilla/mach build || ./mozilla/mach build ./mozilla/mach package diff --git a/projects/instantbird/config b/projects/instantbird/config index 075b115..d32a255 100644 --- a/projects/instantbird/config +++ b/projects/instantbird/config @@ -63,6 +63,8 @@ input_files: - filename: picture.patch - filename: branding.patch - filename: prepare-messages-for-displaying.patch + - filename: fix-mingw-build.nsprpatch + enable: '[% c("var/windows") %]' - filename: 'mozconfig-[% c("var/osname") %]' name: mozconfig - name: python diff --git a/projects/instantbird/fix-mingw-build.nsprpatch b/projects/instantbird/fix-mingw-build.nsprpatch new file mode 100644 index 0000000..76040a5 --- /dev/null +++ b/projects/instantbird/fix-mingw-build.nsprpatch @@ -0,0 +1,44 @@ + +# HG changeset patch +# User Jacek Caban jacek@codeweavers.com +# Date 1412876662 14400 +# Node ID 133b835b9ad96b3314535a0159bf2909c5429025 +# Parent 84acbf6789fb2f82aefbf605f151888a13211f2d +Bug 1060401 - change import library name under mingw. r=ted + +diff --git a/config/rules.mk b/config/rules.mk +--- a/config/rules.mk ++++ b/config/rules.mk +@@ -78,25 +78,29 @@ ifeq (,$(filter-out WINNT WINCE OS2,$(OS + + # + # Win95 and OS/2 require library names conforming to the 8.3 rule. + # other platforms do not. + # + ifeq (,$(filter-out WIN95 WINCE WINMO OS2,$(OS_TARGET))) + LIBRARY = $(OBJDIR)/$(LIBRARY_NAME)$(LIBRARY_VERSION)_s.$(LIB_SUFFIX) + SHARED_LIBRARY = $(OBJDIR)/$(LIBRARY_NAME)$(LIBRARY_VERSION).$(DLL_SUFFIX) +-IMPORT_LIBRARY = $(OBJDIR)/$(LIBRARY_NAME)$(LIBRARY_VERSION).$(LIB_SUFFIX) + SHARED_LIB_PDB = $(OBJDIR)/$(LIBRARY_NAME)$(LIBRARY_VERSION).pdb + else + LIBRARY = $(OBJDIR)/lib$(LIBRARY_NAME)$(LIBRARY_VERSION)_s.$(LIB_SUFFIX) + SHARED_LIBRARY = $(OBJDIR)/lib$(LIBRARY_NAME)$(LIBRARY_VERSION).$(DLL_SUFFIX) +-IMPORT_LIBRARY = $(OBJDIR)/lib$(LIBRARY_NAME)$(LIBRARY_VERSION).$(LIB_SUFFIX) + SHARED_LIB_PDB = $(OBJDIR)/lib$(LIBRARY_NAME)$(LIBRARY_VERSION).pdb + endif + ++ifdef MSC_VER ++IMPORT_LIBRARY = $(OBJDIR)/$(LIBRARY_NAME)$(LIBRARY_VERSION).$(LIB_SUFFIX) ++else ++IMPORT_LIBRARY = $(OBJDIR)/lib$(LIBRARY_NAME)$(LIBRARY_VERSION).$(LIB_SUFFIX) ++endif ++ + else + + LIBRARY = $(OBJDIR)/lib$(LIBRARY_NAME)$(LIBRARY_VERSION).$(LIB_SUFFIX) + ifeq ($(OS_ARCH)$(OS_RELEASE), AIX4.1) + SHARED_LIBRARY = $(OBJDIR)/lib$(LIBRARY_NAME)$(LIBRARY_VERSION)_shr.a + else + ifdef MKSHLIB + SHARED_LIBRARY = $(OBJDIR)/lib$(LIBRARY_NAME)$(LIBRARY_VERSION).$(DLL_SUFFIX) +