c6a65eeffc
* Update enigmail to 1.7.2 Changelog: * SeaMonkey specific changes are not available. * Use xul engine from Firefox 33.
30 lines
1.4 KiB
Makefile
30 lines
1.4 KiB
Makefile
$NetBSD: patch-mozilla_config_rules.mk,v 1.1 2014/11/02 05:40:31 ryoon Exp $
|
|
|
|
--- mozilla/config/rules.mk.orig 2014-10-14 06:36:05.000000000 +0000
|
|
+++ mozilla/config/rules.mk
|
|
@@ -822,6 +822,7 @@ endif
|
|
ifdef DTRACE_PROBE_OBJ
|
|
EXTRA_DEPS += $(DTRACE_PROBE_OBJ)
|
|
OBJS += $(DTRACE_PROBE_OBJ)
|
|
+EXCLUDED_OBJS += $(DTRACE_PROBE_OBJ)
|
|
endif
|
|
|
|
$(filter %.$(LIB_SUFFIX),$(LIBRARY)): $(OBJS) $(EXTRA_DEPS) $(GLOBAL_DEPS)
|
|
@@ -857,7 +858,7 @@ ifdef DTRACE_PROBE_OBJ
|
|
ifndef DTRACE_LIB_DEPENDENT
|
|
NON_DTRACE_OBJS := $(filter-out $(DTRACE_PROBE_OBJ),$(OBJS))
|
|
$(DTRACE_PROBE_OBJ): $(NON_DTRACE_OBJS)
|
|
- dtrace -G -C -s $(MOZILLA_DTRACE_SRC) -o $(DTRACE_PROBE_OBJ) $(NON_DTRACE_OBJS)
|
|
+ dtrace -x nolibs -G -C -s $(MOZILLA_DTRACE_SRC) -o $(DTRACE_PROBE_OBJ) $(NON_DTRACE_OBJS)
|
|
endif
|
|
endif
|
|
endif
|
|
@@ -875,7 +876,7 @@ ifndef INCREMENTAL_LINKER
|
|
endif
|
|
ifdef DTRACE_LIB_DEPENDENT
|
|
ifndef XP_MACOSX
|
|
- dtrace -G -C -s $(MOZILLA_DTRACE_SRC) -o $(DTRACE_PROBE_OBJ) $(shell $(EXPAND_LIBS) $(MOZILLA_PROBE_LIBS))
|
|
+ dtrace -x nolibs -G -C -s $(MOZILLA_DTRACE_SRC) -o $(DTRACE_PROBE_OBJ) $(shell $(EXPAND_LIBS) $(MOZILLA_PROBE_LIBS))
|
|
endif
|
|
$(EXPAND_MKSHLIB) $(SHLIB_LDSTARTFILE) $(OBJS) $(SUB_SHLOBJS) $(DTRACE_PROBE_OBJ) $(MOZILLA_PROBE_LIBS) $(RESFILE) $(LDFLAGS) $(WRAP_LDFLAGS) $(SHARED_LIBRARY_LIBS) $(EXTRA_DSO_LDOPTS) $(MOZ_GLUE_LDFLAGS) $(OS_LIBS) $(EXTRA_LIBS) $(DEF_FILE) $(SHLIB_LDENDFILE) $(if $(LIB_IS_C_ONLY),,$(STLPORT_LIBS))
|
|
@$(RM) $(DTRACE_PROBE_OBJ)
|