f353d0daae
Tested on i386/sparc64/macppc/alpha by myself and/or alek@ One issue found with sparc64: fetching mail crashes. okay pval@
65 lines
2.5 KiB
Plaintext
65 lines
2.5 KiB
Plaintext
$OpenBSD: patch-config_rules_mk,v 1.2 2005/03/13 05:02:16 kurt Exp $
|
|
--- config/rules.mk.orig Thu Jun 24 14:58:48 2004
|
|
+++ config/rules.mk Wed Mar 9 16:53:06 2005
|
|
@@ -666,7 +666,7 @@ ifdef SHARED_LIBRARY
|
|
ifdef IS_COMPONENT
|
|
ifdef GRE_MODULE
|
|
ifndef DISABLE_DIST_GRE
|
|
- $(INSTALL) $(IFLAGS2) $(SHARED_LIBRARY) $(GRE_DIST)/components
|
|
+ $(INSTALL) $(IFLAGS1) $(SHARED_LIBRARY) $(GRE_DIST)/components
|
|
$(ELF_DYNSTR_GC) $(GRE_DIST)/components/$(SHARED_LIBRARY)
|
|
ifdef BEOS_ADDON_WORKAROUND
|
|
( cd $(GRE_DIST)/components && $(CC) -nostart -o $(SHARED_LIBRARY).stub $(SHARED_LIBRARY) )
|
|
@@ -676,7 +676,7 @@ endif # GRE_MODULE
|
|
ifeq ($(OS_ARCH),OS2)
|
|
$(INSTALL) $(IFLAGS2) $(IMPORT_LIBRARY) $(DIST)/lib/components
|
|
else
|
|
- $(INSTALL) $(IFLAGS2) $(SHARED_LIBRARY) $(DIST)/lib/components
|
|
+ $(INSTALL) $(IFLAGS1) $(SHARED_LIBRARY) $(DIST)/lib/components
|
|
$(ELF_DYNSTR_GC) $(DIST)/lib/components/$(SHARED_LIBRARY)
|
|
endif
|
|
ifndef _SKIP_OLD_GRE_INSTALL
|
|
@@ -765,15 +765,15 @@ ifndef NO_INSTALL
|
|
ifdef SHARED_LIBRARY
|
|
ifdef IS_COMPONENT
|
|
ifdef MRE_DIST
|
|
- $(SYSINSTALL) $(IFLAGS2) $(SHARED_LIBRARY) $(IMPORT_LIBRARY) $(DESTDIR)$(mredir)/components
|
|
+ $(SYSINSTALL) $(IFLAGS1) $(SHARED_LIBRARY) $(IMPORT_LIBRARY) $(DESTDIR)$(mredir)/components
|
|
else
|
|
- $(SYSINSTALL) $(IFLAGS2) $(SHARED_LIBRARY) $(IMPORT_LIBRARY) $(DESTDIR)$(mozappdir)/components
|
|
+ $(SYSINSTALL) $(IFLAGS1) $(SHARED_LIBRARY) $(IMPORT_LIBRARY) $(DESTDIR)$(mozappdir)/components
|
|
endif
|
|
else
|
|
ifdef MRE_DIST
|
|
- $(SYSINSTALL) $(IFLAGS2) $(SHARED_LIBRARY) $(IMPORT_LIBRARY) $(DESTDIR)$(mredir)
|
|
+ $(SYSINSTALL) $(IFLAGS1) $(SHARED_LIBRARY) $(IMPORT_LIBRARY) $(DESTDIR)$(mredir)
|
|
else
|
|
- $(SYSINSTALL) $(IFLAGS2) $(SHARED_LIBRARY) $(IMPORT_LIBRARY) $(DESTDIR)$(mozappdir)
|
|
+ $(SYSINSTALL) $(IFLAGS1) $(SHARED_LIBRARY) $(IMPORT_LIBRARY) $(DESTDIR)$(mozappdir)
|
|
endif
|
|
endif
|
|
endif # SHARED_LIBRARY
|
|
@@ -1022,7 +1022,6 @@ endif # NO_LD_ARCHIVE_FLAGS
|
|
else # os2 vacpp
|
|
$(MKSHLIB) /O:$@ /DLL /INC:_dllentry $(LDFLAGS) $(OBJS) $(LOBJS) $(EXTRA_DSO_LDOPTS) $(OS_LIBS) $(EXTRA_LIBS) $(DEF_FILE)
|
|
endif # !os2 vacpp
|
|
- chmod +x $@
|
|
ifndef NO_COMPONENT_LINK_MAP
|
|
ifndef MOZ_COMPONENTS_VERSION_SCRIPT_LDFLAGS
|
|
ifndef MOZ_DEBUG
|
|
@@ -1113,6 +1112,14 @@ endif
|
|
$(REPORT_BUILD)
|
|
@$(MAKE_DEPS_AUTO)
|
|
$(ELOG) $(CCC) $(OUTOPTION)$@ -c $(COMPILE_CXXFLAGS) $(_VPATH_SRCS)
|
|
+
|
|
+#
|
|
+# Temp fix for propolice bug
|
|
+#
|
|
+nsPresShell.$(OBJ_SUFFIX): nsPresShell.cpp Makefile Makefile.in
|
|
+ $(REPORT_BUILD)
|
|
+ @$(MAKE_DEPS_AUTO)
|
|
+ $(ELOG) $(CCC) $(OUTOPTION)$@ -c $(COMPILE_CXXFLAGS) -fno-stack-protector $(_VPATH_SRCS)
|
|
|
|
%.$(OBJ_SUFFIX): %.cpp Makefile Makefile.in
|
|
$(REPORT_BUILD)
|