Magellan Linux

  • Back to homepage
    • /[pkg-src]/trunk/mozilla-firefox/patches/firefox-17.0-webrtc-fix-system-nspr.patch

    Annotation of /trunk/mozilla-firefox/patches/firefox-17.0-webrtc-fix-system-nspr.patch

    Parent Directory Parent Directory | Revision Log Revision Log

    Revision 2218 - (hide annotations) (download)
    Wed Jun 26 11:40:34 2013 UTC (10 years, 11 months ago) by niro
    File size: 1176 byte(s) 
    -added patch to fix build of webrtc
    1 niro 2218 # HG changeset patch
    2     # User Mike Hommey <mh+mozilla@glandium.org>
    3     # Date 1350466554 -7200
    4     # Node ID ba711b0fef346245ae2fb5e8c020f27d46b40870
    5     # Parent 5dc6962cfcd2a1cb2323f127a697f0cd08012767
    6     Bug 799975 - Fix webrtc when building with system nspr/nss
    7    
    8     diff --git a/media/webrtc/trunk/tools/gyp/pylib/gyp/generator/mozmake.py b/media/webrtc/trunk/tools/gyp/pylib/gyp/generator/mozmake.py
    9     --- a/media/webrtc/trunk/tools/gyp/pylib/gyp/generator/mozmake.py
    10     +++ b/media/webrtc/trunk/tools/gyp/pylib/gyp/generator/mozmake.py
    11     @@ -45,16 +45,19 @@ NO_SUBMAKEFILES_RULE = 1
    12     include $(topsrcdir)/config/rules.mk
    13     include $(DEPTH)/%(relative_path)s/common.mk
    14     """
    15    
    16     COMMON_MK = """# This file was generated by mozmake.py. Do not edit it directly.
    17     ifndef COMMON_MK_INCLUDED
    18     COMMON_MK_INCLUDED := 1
    19    
    20     +CFLAGS += $(NSPR_CFLAGS) $(NSS_CFLAGS)
    21     +CXXFLAGS += $(NSPR_CFLAGS) $(NSS_CFLAGS)
    22     +
    23     ifdef MOZ_DEBUG
    24     CFLAGS += $(CPPFLAGS_Debug) $(CFLAGS_Debug)
    25     CXXFLAGS += $(CPPFLAGS_Debug) $(CXXFLAGS_Debug)
    26     DEFINES += $(DEFINES_Debug)
    27     LOCAL_INCLUDES += $(INCLUDES_Debug)
    28     else # non-MOZ_DEBUG
    29     CFLAGS += $(CPPFLAGS_Release) $(CFLAGS_Release)
    30     CXXFLAGS += $(CPPFLAGS_Release) $(CXXFLAGS_Release)