[32560] trunk/dports/net/nss

afb at macports.org afb at macports.org
Mon Jan 7 15:35:41 PST 2008


Revision: 32560
          http://trac.macosforge.org/projects/macports/changeset/32560
Author:   afb at macports.org
Date:     2008-01-07 15:35:39 -0800 (Mon, 07 Jan 2008)

Log Message:
-----------
allow building as +universal (reiffert #13860)

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

Added 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.universal.diff

Modified: trunk/dports/net/nss/Portfile
===================================================================
--- trunk/dports/net/nss/Portfile	2008-01-07 23:34:13 UTC (rev 32559)
+++ trunk/dports/net/nss/Portfile	2008-01-07 23:35:39 UTC (rev 32560)
@@ -4,6 +4,7 @@
 
 name		nss
 version		3.11.7
+revision	1
 categories	net
 maintainers	rsync at reifferscheid.org
 description	Network Security Service libraries.
@@ -25,6 +26,14 @@
 		patch-UNIX.mk.diff \
 		patch-config.mk.diff
 
+variant universal {
+		patchfiles-delete patch-Darwin.mk.diff \
+					patch-config.mk.diff
+		patchfiles-append patch-Darwin.mk.universal.diff \
+					patch-Makefile.universal.diff \
+					patch-config.mk.universal.diff
+}
+
 post-patch {
         reinplace "s|@executable_path|${prefix}/lib|g" \
 		mozilla/security/coreconf/Darwin.mk \

Modified: trunk/dports/net/nss/files/patch-Darwin.mk.diff
===================================================================
--- trunk/dports/net/nss/files/patch-Darwin.mk.diff	2008-01-07 23:34:13 UTC (rev 32559)
+++ trunk/dports/net/nss/files/patch-Darwin.mk.diff	2008-01-07 23:35:39 UTC (rev 32560)
@@ -1,5 +1,23 @@
---- mozilla/security/coreconf/Darwin.mk.orig	2007-11-14 19:41:02.000000000 +0100
-+++ mozilla/security/coreconf/Darwin.mk	2007-11-14 19:41:20.000000000 +0100
+--- mozilla/security/coreconf/Darwin.mk.orig	2008-01-05 04:17:18.000000000 +0100
++++ mozilla/security/coreconf/Darwin.mk	2008-01-05 04:16:10.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
 @@ -111,7 +111,7 @@
  
  DSO_CFLAGS	= -fPIC

Added: trunk/dports/net/nss/files/patch-Darwin.mk.universal.diff
===================================================================
--- trunk/dports/net/nss/files/patch-Darwin.mk.universal.diff	                        (rev 0)
+++ trunk/dports/net/nss/files/patch-Darwin.mk.universal.diff	2008-01-07 23:35:39 UTC (rev 32560)
@@ -0,0 +1,38 @@
+--- 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/Users/admin/pidgin-gtk/gtk/lib
+ 
+ MKSHLIB		= $(CC) $(DSO_LDOPTS) $(DARWIN_SDK_SHLIBFLAGS)
+ DLL_SUFFIX	= dylib

Added: trunk/dports/net/nss/files/patch-Makefile.universal.diff
===================================================================
--- trunk/dports/net/nss/files/patch-Makefile.universal.diff	                        (rev 0)
+++ trunk/dports/net/nss/files/patch-Makefile.universal.diff	2008-01-07 23:35:39 UTC (rev 32560)
@@ -0,0 +1,13 @@
+--- 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
+ 

Added: trunk/dports/net/nss/files/patch-config.mk.universal.diff
===================================================================
--- trunk/dports/net/nss/files/patch-config.mk.universal.diff	                        (rev 0)
+++ trunk/dports/net/nss/files/patch-config.mk.universal.diff	2008-01-07 23:35:39 UTC (rev 32560)
@@ -0,0 +1,11 @@
+--- 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/20080107/e8e0c660/attachment.html


More information about the macports-changes mailing list