diff options
| author | sno <sno@pkgsrc.org> | 2009-10-11 07:51:48 +0000 |
|---|---|---|
| committer | sno <sno@pkgsrc.org> | 2009-10-11 07:51:48 +0000 |
| commit | c1fbb9ad462f51188399fd142b133de576ab27a9 (patch) | |
| tree | 039e86abb257e481267ad1227a8cea2d4c3481cc /devel/nss | |
| parent | 191ea8e095b24d93d3ed5362ed75ff8154cb6d62 (diff) | |
| download | pkgsrc-c1fbb9ad462f51188399fd142b133de576ab27a9.tar.gz | |
Fix nss build on FreeBSD
Diffstat (limited to 'devel/nss')
| -rw-r--r-- | devel/nss/distinfo | 4 | ||||
| -rw-r--r-- | devel/nss/patches/patch-as | 62 | ||||
| -rw-r--r-- | devel/nss/patches/patch-at | 16 |
3 files changed, 81 insertions, 1 deletions
diff --git a/devel/nss/distinfo b/devel/nss/distinfo index f6fba571b5b..fe8f81fd9dd 100644 --- a/devel/nss/distinfo +++ b/devel/nss/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.18 2007/03/21 06:53:25 wiz Exp $ +$NetBSD: distinfo,v 1.19 2009/10/11 07:51:48 sno Exp $ SHA1 (nss-3.11.5.tar.gz) = 2cde010908ab41777e43fda83be0a925010c4a09 RMD160 (nss-3.11.5.tar.gz) = fe49128857bbc645d6ee8824c96e9ff0461438c0 @@ -12,3 +12,5 @@ SHA1 (patch-ah) = fa302e20163db73a1453b4e360f7f55377b7bea2 SHA1 (patch-ai) = 80a18536703d7f01b28448e503f49da50b07304e SHA1 (patch-ak) = 371eb96e2874ef8ec841dc886a70f2b5215f701d SHA1 (patch-an) = c9d8f350488cc383a0e9bd25b69b270f678c4736 +SHA1 (patch-as) = 5d1c7f7bfc3f167052985c2714099f82ad8f4e25 +SHA1 (patch-at) = 3c963ca8a6a2ad8c6591d2ec37c431435cd6704a diff --git a/devel/nss/patches/patch-as b/devel/nss/patches/patch-as new file mode 100644 index 00000000000..c75fa75e114 --- /dev/null +++ b/devel/nss/patches/patch-as @@ -0,0 +1,62 @@ +$NetBSD: patch-as,v 1.1 2009/10/11 07:51:48 sno Exp $ + +Apply patches from FreeBSD ports + +--- mozilla/security/coreconf/FreeBSD.mk.orig 2009-09-27 13:47:48.000000000 +0200 ++++ mozilla/security/coreconf/FreeBSD.mk 2009-09-27 14:01:51.000000000 +0200 +@@ -37,13 +37,25 @@ + + include $(CORE_DEPTH)/coreconf/UNIX.mk + +-DEFAULT_COMPILER = gcc +-CC = gcc +-CCC = g++ ++DEFAULT_COMPILER = $(CC) ++CC ?= gcc ++CCC = $(CXX) + RANLIB = ranlib + + ifeq ($(OS_TEST),alpha) + CPU_ARCH = alpha ++ifeq ($(OS_TEST),powerpc) ++CPU_ARCH = powerpc ++else ++ifeq ($(OS_TEST),sparc64) ++CPU_ARCH = sparc64 ++USE_64 = 1 ++else ++ifeq ($(OS_TEST),amd64) ++USE_64 = 1 ++endif ++endif ++endif + else + CPU_ARCH = x86 + endif +@@ -65,15 +77,15 @@ + + ARCH = freebsd + +-MOZ_OBJFORMAT := $(shell test -x /usr/bin/objformat && /usr/bin/objformat || echo aout) ++#MOZ_OBJFORMAT := $(shell test -x /usr/bin/objformat && /usr/bin/objformat || echo aout) ++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 +@@ -83,3 +95,5 @@ + G++INCLUDES = -I/usr/include/g++ + + INCLUDES += -I/usr/X11R6/include ++USE_SYSTEM_ZLIB = 1 ++ZLIB_LIBS = -lz diff --git a/devel/nss/patches/patch-at b/devel/nss/patches/patch-at new file mode 100644 index 00000000000..0db8c34d602 --- /dev/null +++ b/devel/nss/patches/patch-at @@ -0,0 +1,16 @@ +$NetBSD: patch-at,v 1.1 2009/10/11 07:51:49 sno Exp $ + +Fix missing *.so.1 links on FreeBSD + +--- mozilla/security/coreconf/rules.mk.orig 2007-01-06 06:48:54.000000000 +0100 ++++ mozilla/security/coreconf/rules.mk 2009-09-27 14:12:54.000000000 +0200 +@@ -114,6 +114,9 @@ + endif + ifdef SHARED_LIBRARY + $(INSTALL) -m 775 $(SHARED_LIBRARY) $(SOURCE_LIB_DIR) ++ifeq ($(OS_TARGET),FreeBSD) ++ ln -sf $(notdir $(SHARED_LIBRARY)) $(SOURCE_LIB_DIR)/$(notdir $(SHARED_LIBRARY:.so.1=.so)) ++endif + ifdef MOZ_DEBUG_SYMBOLS + ifeq (,$(filter-out _WIN%,$(NS_USE_GCC)_$(OS_TARGET))) + $(INSTALL) -m 644 $(SHARED_LIBRARY:$(DLL_SUFFIX)=pdb) $(SOURCE_LIB_DIR) |