[49441] trunk/dports/net/nss

jeremyhu at macports.org jeremyhu at macports.org
Thu Apr 9 15:15:52 PDT 2009 

Revision: 49441
          http://trac.macports.org/changeset/49441
Author:   jeremyhu at macports.org
Date:     2009-04-09 15:15:51 -0700 (Thu, 09 Apr 2009)
Log Message:
-----------
nss: Fix building of nss to not link against installed libs.  Closes #18930

Modified Paths:
--------------
    trunk/dports/net/nss/Portfile
    trunk/dports/net/nss/files/patch-Darwin.mk.diff
    trunk/dports/net/nss/files/patch-UNIX.mk.diff

Removed Paths:
-------------
    trunk/dports/net/nss/files/patch-Darwin.mk.universal.diff
    trunk/dports/net/nss/files/patch-Makefile.universal.diff
    trunk/dports/net/nss/files/patch-config.mk.diff
    trunk/dports/net/nss/files/patch-config.mk.universal.diff

Modified: trunk/dports/net/nss/Portfile
===================================================================
--- trunk/dports/net/nss/Portfile	2009-04-09 22:13:42 UTC (rev 49440)
+++ trunk/dports/net/nss/Portfile	2009-04-09 22:15:51 UTC (rev 49441)
@@ -33,7 +33,6 @@
 worksrcdir      ${worksrcpath}
 
 patchfiles	patch-UNIX.mk.diff \
-		patch-config.mk.diff \
 		patch-Darwin.mk.diff
 
 post-patch {
@@ -44,8 +43,7 @@
 		${worksrcpath}/mozilla/security/nss/lib/ssl/config.mk
         reinplace "s|@@PREFIX@@|${prefix}|g" \
 		${worksrcpath}/mozilla/security/coreconf/Darwin.mk \
-		${worksrcpath}/mozilla/security/coreconf/UNIX.mk \
-		${worksrcpath}/mozilla/security/nss/lib/ckfw/builtins/config.mk
+		${worksrcpath}/mozilla/security/coreconf/UNIX.mk
         reinplace "s|= cc\$|= ${configure.cc}|" \
 		${worksrcpath}/mozilla/security/coreconf/Darwin.mk
         reinplace "s|= c++\$|= ${configure.cxx}|" \

Modified: trunk/dports/net/nss/files/patch-Darwin.mk.diff
===================================================================
--- trunk/dports/net/nss/files/patch-Darwin.mk.diff	2009-04-09 22:13:42 UTC (rev 49440)
+++ trunk/dports/net/nss/files/patch-Darwin.mk.diff	2009-04-09 22:15:51 UTC (rev 49441)
@@ -23,7 +23,7 @@
  DSO_CFLAGS	= -fPIC
  # May override this with -bundle to create a loadable module.
 -DSO_LDOPTS	= -dynamiclib -compatibility_version 1 -current_version 1 -install_name @executable_path/$(notdir $@) -headerpad_max_install_names
-+DSO_LDOPTS	= -dynamiclib -compatibility_version 1 -current_version 1 -install_name @executable_path/$(notdir $@) -headerpad_max_install_names -L@@PREFIX@@/lib
++DSO_LDOPTS	= -dynamiclib -compatibility_version 1 -current_version 1 -install_name @executable_path/$(notdir $@) -headerpad_max_install_names -L@@PREFIX@@/lib/nspr
  
  MKSHLIB		= $(CC) $(DSO_LDOPTS) $(DARWIN_SDK_SHLIBFLAGS)
  DLL_SUFFIX	= dylib

Deleted: trunk/dports/net/nss/files/patch-Darwin.mk.universal.diff
===================================================================
--- trunk/dports/net/nss/files/patch-Darwin.mk.universal.diff	2009-04-09 22:13:42 UTC (rev 49440)
+++ trunk/dports/net/nss/files/patch-Darwin.mk.universal.diff	2009-04-09 22:15:51 UTC (rev 49441)
@@ -1,38 +0,0 @@
---- mozilla/security/coreconf/Darwin.mk.orig	2008-01-05 20:09:23.000000000 +0100
-+++ mozilla/security/coreconf/Darwin.mk	2008-01-05 20:11:27.000000000 +0100
-@@ -74,7 +74,7 @@
-         export NEXT_ROOT
-     else
-         # GCC >= 4
--        DARWIN_SDK_CFLAGS = -isysroot $(MACOS_SDK_DIR)
-+        DARWIN_SDK_CFLAGS = -isysroot $(MACOS_SDK_DIR) -arch i386 -arch ppc
-         ifneq (4.0.0,$(GCC_VERSION_FULL))
-             # gcc > 4.0.0 passes -syslibroot to ld based on -isysroot.
-             # Don't add -isysroot to DARWIN_SDK_LDFLAGS, because the programs
-@@ -83,7 +83,7 @@
-         else
-             # gcc 4.0.0 doesn't pass -syslibroot to ld, it needs to be
-             # explicit.
--            DARWIN_SDK_LDFLAGS = -Wl,-syslibroot,$(MACOS_SDK_DIR)
-+            DARWIN_SDK_LDFLAGS = -Wl,-syslibroot,$(MACOS_SDK_DIR) -arch i386 -arch ppc
-             DARWIN_SDK_SHLIBFLAGS = $(DARWIN_SDK_LDFLAGS)
-         endif
-     endif
-@@ -101,7 +101,7 @@
- # definitions so that the linker can catch multiply-defined symbols.
- # Also, common symbols are not allowed with Darwin dynamic libraries.
- 
--OS_CFLAGS	= $(DSO_CFLAGS) $(OS_REL_CFLAGS) -Wmost -fpascal-strings -no-cpp-precomp -fno-common -pipe -DDARWIN -DHAVE_STRERROR -DHAVE_BSD_FLOCK $(DARWIN_SDK_CFLAGS)
-+OS_CFLAGS	= -arch i386 -arch ppc $(DSO_CFLAGS) $(OS_REL_CFLAGS) -Wmost -fpascal-strings -no-cpp-precomp -fno-common -pipe -DDARWIN -DHAVE_STRERROR -DHAVE_BSD_FLOCK $(DARWIN_SDK_CFLAGS)
- 
- ifdef BUILD_OPT
- OPTIMIZER	= -O2
-@@ -111,7 +111,7 @@
- 
- DSO_CFLAGS	= -fPIC
- # May override this with -bundle to create a loadable module.
--DSO_LDOPTS	= -dynamiclib -compatibility_version 1 -current_version 1 -install_name @executable_path/$(notdir $@) -headerpad_max_install_names
-+DSO_LDOPTS	= -arch i386 -arch ppc -dynamiclib -compatibility_version 1 -current_version 1 -install_name @executable_path/$(notdir $@) -headerpad_max_install_names -L at executable_path/
- 
- MKSHLIB		= $(CC) $(DSO_LDOPTS) $(DARWIN_SDK_SHLIBFLAGS)
- DLL_SUFFIX	= dylib

Deleted: trunk/dports/net/nss/files/patch-Makefile.universal.diff
===================================================================
--- trunk/dports/net/nss/files/patch-Makefile.universal.diff	2009-04-09 22:13:42 UTC (rev 49440)
+++ trunk/dports/net/nss/files/patch-Makefile.universal.diff	2009-04-09 22:15:51 UTC (rev 49441)
@@ -1,13 +0,0 @@
---- mozilla/security/nss/lib/freebl/Makefile.orig	2008-01-05 20:13:35.000000000 +0100
-+++ mozilla/security/nss/lib/freebl/Makefile	2008-01-05 21:11:25.000000000 +0100
-@@ -433,6 +433,10 @@
- vpath %.s mpi ecl
- INCLUDES += -Impi -Iecl
- 
-+$(OBJDIR)/mpcpucache.o: mpi/mpcpucache.c
-+	$(CC) -o $(OBJDIR)/mpcpucache_x86.o -c $(subst ppc,i386,$(CFLAGS)) $<
-+	$(CC) -o $(OBJDIR)/mpcpucache_ppc.o -c $(subst i386,ppc,$(CFLAGS)) $<
-+	lipo -arch i386 $(OBJDIR)/mpcpucache_x86.o -arch ppc $(OBJDIR)/mpcpucache_ppc.o -create -output $(OBJDIR)/mpcpucache.o
- 
- DEFINES += -DMP_API_COMPATIBLE
- 

Modified: trunk/dports/net/nss/files/patch-UNIX.mk.diff
===================================================================
--- trunk/dports/net/nss/files/patch-UNIX.mk.diff	2009-04-09 22:13:42 UTC (rev 49440)
+++ trunk/dports/net/nss/files/patch-UNIX.mk.diff	2009-04-09 22:15:51 UTC (rev 49441)
@@ -5,7 +5,7 @@
  else
  	OPTIMIZER  += -g
 -	DEFINES    += -DDEBUG -UNDEBUG -DDEBUG_$(shell whoami)
-+	DEFINES    += -DDEBUG -UNDEBUG -DDEBUG_$(shell whoami) -I@@PREFIX@@/include/nspr/ -L@@PREFIX@@/lib
++	DEFINES    += -DDEBUG -UNDEBUG -DDEBUG_$(shell whoami) -I@@PREFIX@@/include/nspr -L@@PREFIX@@/lib/nspr
  endif
  
  ifdef BUILD_TREE

Deleted: trunk/dports/net/nss/files/patch-config.mk.diff
===================================================================
--- trunk/dports/net/nss/files/patch-config.mk.diff	2009-04-09 22:13:42 UTC (rev 49440)
+++ trunk/dports/net/nss/files/patch-config.mk.diff	2009-04-09 22:15:51 UTC (rev 49441)
@@ -1,11 +0,0 @@
---- mozilla/security/nss/lib/ckfw/builtins/config.mk.orig	2007-11-14 19:51:59.000000000 +0100
-+++ mozilla/security/nss/lib/ckfw/builtins/config.mk	2007-11-14 19:52:38.000000000 +0100
-@@ -60,7 +60,7 @@
- # To create a loadable module on Darwin, we must use -bundle.
- #
- ifeq ($(OS_TARGET),Darwin)
--DSO_LDOPTS = -bundle
-+DSO_LDOPTS = -bundle -L@@PREFIX@@/lib
- endif
- 
- ifeq ($(OS_TARGET),SunOS)

Deleted: trunk/dports/net/nss/files/patch-config.mk.universal.diff
===================================================================
--- trunk/dports/net/nss/files/patch-config.mk.universal.diff	2009-04-09 22:13:42 UTC (rev 49440)
+++ trunk/dports/net/nss/files/patch-config.mk.universal.diff	2009-04-09 22:15:51 UTC (rev 49441)
@@ -1,11 +0,0 @@
---- mozilla/security/nss/lib/ckfw/builtins/config.mk.orig	2008-01-05 21:38:36.000000000 +0100
-+++ mozilla/security/nss/lib/ckfw/builtins/config.mk	2008-01-05 21:38:55.000000000 +0100
-@@ -60,7 +60,7 @@
- # To create a loadable module on Darwin, we must use -bundle.
- #
- ifeq ($(OS_TARGET),Darwin)
--DSO_LDOPTS = -bundle
-+DSO_LDOPTS = -arch i386 -arch ppc -bundle -L@@PREFIX@@/lib
- endif
- 
- ifeq ($(OS_TARGET),SunOS)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090409/ab6efc6c/attachment.html>

More information about the macports-changes mailing list