diff options
Diffstat (limited to 'www/seamonkey/patches/patch-mk')
| -rw-r--r-- | www/seamonkey/patches/patch-mk | 26 |
1 files changed, 22 insertions, 4 deletions
diff --git a/www/seamonkey/patches/patch-mk b/www/seamonkey/patches/patch-mk index 8898d65c569..1948afad855 100644 --- a/www/seamonkey/patches/patch-mk +++ b/www/seamonkey/patches/patch-mk @@ -1,10 +1,10 @@ -$NetBSD: patch-mk,v 1.5 2012/04/28 22:48:06 ryoon Exp $ +$NetBSD: patch-mk,v 1.6 2012/06/14 11:27:34 ryoon Exp $ Treat DragonFly like FreeBSD. ---- mozilla/config/rules.mk.orig 2012-04-23 06:27:25.000000000 +0000 +--- mozilla/config/rules.mk.orig 2012-06-05 05:54:07.000000000 +0000 +++ mozilla/config/rules.mk -@@ -601,6 +601,12 @@ EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic +@@ -588,6 +588,12 @@ EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic endif endif @@ -17,7 +17,7 @@ Treat DragonFly like FreeBSD. ifeq ($(OS_ARCH),NetBSD) ifneq (,$(filter arc cobalt hpcmips mipsco newsmips pmax sgimips,$(OS_TEST))) ifeq ($(MODULE),layout) -@@ -610,6 +616,10 @@ endif +@@ -597,6 +603,10 @@ endif endif endif @@ -28,3 +28,21 @@ Treat DragonFly like FreeBSD. # # HP-UXBeOS specific section: for COMPONENTS only, add -Bsymbolic flag # which uses internal symbols first +@@ -1479,7 +1489,7 @@ $(XPIDL_GEN_DIR)/%.h: %.idl $(XPIDL_DEPS + $(PYTHON_PATH) \ + -I$(topsrcdir)/other-licenses/ply \ + -I$(topsrcdir)/xpcom/idl-parser \ +- $(topsrcdir)/xpcom/idl-parser/header.py --cachedir=$(DEPTH)/xpcom/idl-parser $(XPIDL_FLAGS) $(_VPATH_SRCS) -d $(MDDEPDIR)/$(@F).pp -o $@ ++ $(topsrcdir)/xpcom/idl-parser/header.py --cachedir=$(DEPTH)/xpcom/idl-parser/cache $(XPIDL_FLAGS) $(_VPATH_SRCS) -d $(MDDEPDIR)/$(@F).pp -o $@ + @if test -n "$(findstring $*.h, $(EXPORTS))"; \ + then echo "*** WARNING: file $*.h generated from $*.idl overrides $(srcdir)/$*.h"; else true; fi + +@@ -1492,7 +1502,7 @@ $(XPIDL_GEN_DIR)/%.xpt: %.idl $(XPIDL_DE + -I$(topsrcdir)/other-licenses/ply \ + -I$(topsrcdir)/xpcom/idl-parser \ + -I$(topsrcdir)/xpcom/typelib/xpt/tools \ +- $(topsrcdir)/xpcom/idl-parser/typelib.py --cachedir=$(DEPTH)/xpcom/idl-parser $(XPIDL_FLAGS) $(_VPATH_SRCS) -d $(MDDEPDIR)/$(@F).pp -o $@ ++ $(topsrcdir)/xpcom/idl-parser/typelib.py --cachedir=$(DEPTH)/xpcom/idl-parser/cache $(XPIDL_FLAGS) $(_VPATH_SRCS) -d $(MDDEPDIR)/$(@F).pp -o $@ + + # no need to link together if XPIDLSRCS contains only XPIDL_MODULE + ifneq ($(XPIDL_MODULE).idl,$(strip $(XPIDLSRCS))) |