aboutsummaryrefslogtreecommitdiff
path: root/www/mozilla-vendor/files/patch-ap
diff options
context:
space:
mode:
Diffstat (limited to 'www/mozilla-vendor/files/patch-ap')
-rw-r--r--www/mozilla-vendor/files/patch-ap20
1 files changed, 10 insertions, 10 deletions
diff --git a/www/mozilla-vendor/files/patch-ap b/www/mozilla-vendor/files/patch-ap
index beef296a4102..0c7ad10d2fac 100644
--- a/www/mozilla-vendor/files/patch-ap
+++ b/www/mozilla-vendor/files/patch-ap
@@ -4,8 +4,8 @@
# each OS release. #
#######################################################################
--ifeq (,$(filter-out NetBSD,$(OS_TARGET)))
-+ifeq (,$(filter-out FreeBSD,$(OS_TARGET)))
+-ifeq (,$(filter-out NetBSD OS2,$(OS_TARGET)))
++ifeq (,$(filter-out NetBSD OS2 FreeBSD,$(OS_TARGET)))
include $(CORE_DEPTH)/coreconf/$(OS_TARGET).mk
else
include $(CORE_DEPTH)/coreconf/$(OS_CONFIG).mk
@@ -15,23 +15,23 @@
CORE_DEPTH=$(topsrcdir)/security
include $(CORE_DEPTH)/coreconf/arch.mk
--ifeq (,$(filter-out NetBSD,$(OS_TARGET)))
-+ifeq (,$(filter-out FreeBSD,$(OS_TARGET)))
+-ifeq (,$(filter-out NetBSD OS2,$(OS_TARGET)))
++ifeq (,$(filter-out NetBSD OS2 FreeBSD,$(OS_TARGET)))
include $(CORE_DEPTH)/coreconf/$(OS_TARGET).mk
else
include $(CORE_DEPTH)/coreconf/$(OS_CONFIG).mk
--- security/psm/server/Makefile.orig Tue Dec 19 17:24:58 2000
+++ security/psm/server/Makefile Fri Jan 19 03:49:36 2001
-@@ -37,7 +37,7 @@
- endif
-
- ifneq ($(OS_ARCH), WINNT)
+@@ -39,7 +39,7 @@
+ # The following don't need a CPLUSPLUSRUNTIME defined: WINNT, HP-UX
+ # so filter them out.
+ ifeq (,$(filter WINNT HP-UX,$(OS_ARCH)))
-ifeq ($(OS_ARCH), Linux)
+ifeq ($(OS_ARCH), FreeBSD)
# On linux, we link with libstdc++ (we're always using egcs on linux, right?)
CPLUSPLUSRUNTIME = -L /usr/lib -lstdc++ -lm
else
-@@ -57,11 +57,11 @@
+@@ -59,11 +59,11 @@
endif
endif
@@ -45,7 +45,7 @@
endif
endif
-@@ -158,8 +158,8 @@
+@@ -153,8 +153,8 @@
XPCOM_LINK_LIBS = -lxpcom
XPCOM_LIBS += $(DIST)/lib/libz.$(DLL_SUFFIX)
else