mirror of
https://git.freebsd.org/ports.git
synced 2025-05-30 09:56:43 -04:00
9e2d4844cf
- Sync changes from gecko repository@r995 general - don't specify prefix for libevent when using pkg-config - ia64 and sparc64 use 8k pagesize by default - add visibility hack for clang 3.2 with libc++ - fix build using clang 3.2 (on FreeBSD 10-CURRENT) - rename a few more patches to ease tracking of bugzilla bugs www/seamonkey - unbreak unsetting LDAP and MAILNEWS options after bug 707305 - use compile time debugging WITH_DEBUG security/nss - unbreak install WITH_DEBUG - unbreak powerpc64 devel/nspr - use absolute paths when specifiying srcdir to make gdb(1) happy In collaboration with: andreast, zeising, Jan Beich <jbeich@tormail.org>
62 lines
1.4 KiB
Makefile
62 lines
1.4 KiB
Makefile
--- ../../security/coreconf/FreeBSD.mk.orig 2009-08-22 07:33:09.000000000 +0200
|
|
+++ ../../security/coreconf/FreeBSD.mk 2010-03-28 23:01:33.000000000 +0200
|
|
@@ -37,9 +37,9 @@
|
|
|
|
include $(CORE_DEPTH)/coreconf/UNIX.mk
|
|
|
|
-DEFAULT_COMPILER = gcc
|
|
-CC = gcc
|
|
-CCC = g++
|
|
+DEFAULT_COMPILER = $(CC)
|
|
+CC ?= gcc
|
|
+CCC = $(CXX)
|
|
RANLIB = ranlib
|
|
|
|
CPU_ARCH = $(OS_TEST)
|
|
@@ -52,6 +52,13 @@ endif
|
|
ifeq ($(CPU_ARCH),amd64)
|
|
CPU_ARCH = x86_64
|
|
endif
|
|
+ifneq (,$(filter powerpc%, $(CPU_ARCH)))
|
|
+CPU_ARCH = ppc
|
|
+endif
|
|
+
|
|
+ifneq (,$(filter %64, $(OS_TEST)))
|
|
+USE_64 = 1
|
|
+endif
|
|
|
|
OS_CFLAGS = $(DSO_CFLAGS) -ansi -Wall -Wno-switch -DFREEBSD -DHAVE_STRERROR -DHAVE_BSD_FLOCK
|
|
|
|
@@ -65,20 +80,18 @@
|
|
USE_PTHREADS = 1
|
|
DEFINES += -D_THREAD_SAFE -D_REENTRANT
|
|
OS_LIBS += -pthread
|
|
-DSO_LDOPTS += -pthread
|
|
+DSO_LDOPTS += $(BSD_LDOPTS)
|
|
endif
|
|
|
|
ARCH = freebsd
|
|
|
|
-MOZ_OBJFORMAT := $(shell test -x /usr/bin/objformat && /usr/bin/objformat || echo elf)
|
|
+DLL_SUFFIX = so.1
|
|
|
|
-ifeq ($(MOZ_OBJFORMAT),elf)
|
|
-DLL_SUFFIX = so
|
|
+ifneq (,$(filter alpha ia64,$(OS_TEST)))
|
|
+MKSHLIB = $(CC) -Wl,-Bsymbolic -lc $(DSO_LDOPTS)
|
|
else
|
|
-DLL_SUFFIX = so.1.0
|
|
+MKSHLIB = $(CC) -Wl,-Bsymbolic $(DSO_LDOPTS)
|
|
endif
|
|
-
|
|
-MKSHLIB = $(CC) $(DSO_LDOPTS)
|
|
ifdef MAPFILE
|
|
MKSHLIB += -Wl,--version-script,$(MAPFILE)
|
|
endif
|
|
@@ -87,4 +100,5 @@
|
|
|
|
G++INCLUDES = -I/usr/include/g++
|
|
|
|
-INCLUDES += -I/usr/X11R6/include
|
|
+USE_SYSTEM_ZLIB = 1
|
|
+ZLIB_LIBS = -lz
|