]> git.pld-linux.org Git - packages/firefox.git/commitdiff
- fix compilation errors when building with system nss
authorhawk <hawk@pld-linux.org>
Sat, 21 Jun 2008 18:14:40 +0000 (18:14 +0000)
committercvs2git <feedback@pld-linux.org>
Sun, 24 Jun 2012 12:13:13 +0000 (12:13 +0000)
Changed files:
    mozilla-firefox-nss_cflags.patch -> 1.1

mozilla-firefox-nss_cflags.patch [new file with mode: 0644]

diff --git a/mozilla-firefox-nss_cflags.patch b/mozilla-firefox-nss_cflags.patch
new file mode 100644 (file)
index 0000000..90d0154
--- /dev/null
@@ -0,0 +1,42 @@
+--- mozilla/config/autoconf.mk.in.orig 2008-06-19 17:55:40.000000000 +0200
++++ mozilla/config/autoconf.mk.in      2008-06-19 18:45:18.000000000 +0200
+@@ -276,7 +276,7 @@
+ OS_COMPILE_CFLAGS = $(OS_CPPFLAGS) @COMPILE_CFLAGS@
+ OS_COMPILE_CXXFLAGS = $(OS_CPPFLAGS) @COMPILE_CXXFLAGS@
+-OS_INCLUDES   = $(NSPR_CFLAGS) $(JPEG_CFLAGS) $(PNG_CFLAGS) $(ZLIB_CFLAGS) $(LCMS_CFLAGS)
++OS_INCLUDES   = $(NSPR_CFLAGS) $(NSS_CFLAGS) $(JPEG_CFLAGS) $(PNG_CFLAGS) $(ZLIB_CFLAGS) $(LCMS_CFLAGS)
+ OS_LIBS               = @LIBS@
+ ACDEFINES     = @MOZ_DEFINES@
+--- mozilla/config/rules.mk.orig       2008-06-19 18:45:00.000000000 +0200
++++ mozilla/config/rules.mk    2008-06-19 18:42:40.000000000 +0200
+@@ -1235,23 +1235,23 @@
+ # Rules for building native targets must come first because of the host_ prefix
+ host_%.$(OBJ_SUFFIX): %.c Makefile Makefile.in
+       $(REPORT_BUILD)
+-      $(ELOG) $(HOST_CC) $(HOST_OUTOPTION)$@ -c $(HOST_CFLAGS) $(INCLUDES) $(NSPR_CFLAGS) $(_VPATH_SRCS)
++      $(ELOG) $(HOST_CC) $(HOST_OUTOPTION)$@ -c $(HOST_CFLAGS) $(INCLUDES) $(NSPR_CFLAGS) $(NSS_CFLAGS) $(_VPATH_SRCS)
+ host_%.$(OBJ_SUFFIX): %.cpp Makefile Makefile.in
+       $(REPORT_BUILD)
+-      $(ELOG) $(HOST_CXX) $(HOST_OUTOPTION)$@ -c $(HOST_CXXFLAGS) $(INCLUDES) $(NSPR_CFLAGS) $(_VPATH_SRCS)
++      $(ELOG) $(HOST_CXX) $(HOST_OUTOPTION)$@ -c $(HOST_CXXFLAGS) $(INCLUDES) $(NSPR_CFLAGS) $(NSS_CFLAGS) $(_VPATH_SRCS)
+ host_%.$(OBJ_SUFFIX): %.cc Makefile Makefile.in
+       $(REPORT_BUILD)
+-      $(ELOG) $(HOST_CXX) $(HOST_OUTOPTION)$@ -c $(HOST_CXXFLAGS) $(INCLUDES) $(NSPR_CFLAGS) $(_VPATH_SRCS)
++      $(ELOG) $(HOST_CXX) $(HOST_OUTOPTION)$@ -c $(HOST_CXXFLAGS) $(INCLUDES) $(NSPR_CFLAGS) $(NSS_CFLAGS) $(_VPATH_SRCS)
+ host_%.$(OBJ_SUFFIX): %.m Makefile Makefile.in
+       $(REPORT_BUILD)
+-      $(ELOG) $(HOST_CC) $(HOST_OUTOPTION)$@ -c $(HOST_CFLAGS) $(HOST_CMFLAGS) $(INCLUDES) $(NSPR_CFLAGS) $(_VPATH_SRCS)
++      $(ELOG) $(HOST_CC) $(HOST_OUTOPTION)$@ -c $(HOST_CFLAGS) $(HOST_CMFLAGS) $(INCLUDES) $(NSPR_CFLAGS) $(NSS_CFLAGS) $(_VPATH_SRCS)
+ host_%.$(OBJ_SUFFIX): %.mm Makefile Makefile.in
+       $(REPORT_BUILD)
+-      $(ELOG) $(HOST_CXX) $(HOST_OUTOPTION)$@ -c $(HOST_CXXFLAGS) $(HOST_CMMFLAGS) $(INCLUDES) $(NSPR_CFLAGS) $(_VPATH_SRCS)
++      $(ELOG) $(HOST_CXX) $(HOST_OUTOPTION)$@ -c $(HOST_CXXFLAGS) $(HOST_CMMFLAGS) $(INCLUDES) $(NSPR_CFLAGS) $(NSS_CFLAGS) $(_VPATH_SRCS)
+ %: %.c Makefile Makefile.in
+       $(REPORT_BUILD)
This page took 0.492318 seconds and 4 git commands to generate.