freebsd-ports/security/nss/files/patch-coreconf_FreeBSD.mk

59 lines
1.3 KiB
Makefile
Raw Normal View History

--- coreconf/FreeBSD.mk.orig 2009-08-22 07:33:09.000000000 +0200
+++ coreconf/FreeBSD.mk 2010-03-28 23:01:33.000000000 +0200
2010-04-10 11:19:21 +02:00
@@ -37,9 +37,9 @@
2007-01-30 21:23:04 +01:00
include $(CORE_DEPTH)/coreconf/UNIX.mk
-DEFAULT_COMPILER = gcc
-CC = gcc
-CCC = g++
+DEFAULT_COMPILER = $(CC)
2002-08-08 21:05:41 +02:00
+CC ?= gcc
+CCC = $(CXX)
RANLIB = ranlib
2010-04-10 11:19:21 +02:00
CPU_ARCH = $(OS_TEST)
@@ -52,6 +52,13 @@ endif
2010-04-10 11:19:21 +02:00
ifeq ($(CPU_ARCH),amd64)
CPU_ARCH = x86_64
endif
+ifneq (,$(filter powerpc%, $(CPU_ARCH)))
+CPU_ARCH = ppc
2010-04-10 11:19:21 +02:00
+endif
+
+ifneq (,$(filter %64, $(OS_TEST)))
+USE_64 = 1
2010-04-10 11:19:21 +02:00
+endif
OS_CFLAGS = $(DSO_CFLAGS) -ansi -Wall -Wno-switch -DFREEBSD -DHAVE_STRERROR -DHAVE_BSD_FLOCK
@@ -70,15 +85,15 @@
2007-01-30 21:23:04 +01:00
ARCH = freebsd
-MOZ_OBJFORMAT := $(shell test -x /usr/bin/objformat && /usr/bin/objformat || echo elf)
+ifndef MOZILLA_CLIENT
+DLL_SUFFIX = so.1
+endif
2007-01-30 21:23:04 +01:00
-ifeq ($(MOZ_OBJFORMAT),elf)
-DLL_SUFFIX = so
+ifneq (,$(filter alpha ia64,$(OS_TEST)))
+MKSHLIB = $(CC) -Wl,-Bsymbolic -lc $(DSO_LDOPTS)
2007-01-30 21:23:04 +01:00
else
-DLL_SUFFIX = so.1.0
+MKSHLIB = $(CC) -Wl,-Bsymbolic $(DSO_LDOPTS)
2007-01-30 21:23:04 +01:00
endif
2008-03-12 14:12:02 +01:00
-
2007-01-30 21:23:04 +01:00
-MKSHLIB = $(CC) $(DSO_LDOPTS)
ifdef MAPFILE
2007-01-30 21:23:04 +01:00
MKSHLIB += -Wl,--version-script,$(MAPFILE)
endif
2010-04-10 11:19:21 +02:00
@@ -87,4 +100,5 @@
2007-01-30 21:23:04 +01:00
G++INCLUDES = -I/usr/include/g++
-INCLUDES += -I/usr/X11R6/include
+USE_SYSTEM_ZLIB = 1
+ZLIB_LIBS = -lz