From a1a059467b92496c99600f0fd9a91d035066c063 Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Wed, 28 Sep 2011 13:53:15 +0200
Subject: Fix building moz on Mac OS X.

* On Mac, nss-config must not emit -rpath-link switch.
* --with-system-nss/-nspr horribly broke in combination with the
  routine use of MOZ_ARCH and resulting MOZ_CROSS_COMPILE for Mac,
  and the latter appears to be unnecessary for a normal build, anyway,
  so is now conditional CREATE_UNIVERSAL_MAC_MOZ_ZIP, in case anybody
  still uses the code to create universal moz archives.
* This in turn revealed two issues in moz that have been addressed
  with a new macosx_build_fix.patch.
---
 nss/nss-config.patch | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'nss')

diff --git a/nss/nss-config.patch b/nss/nss-config.patch
index 3f67f84ae85c..d65499fb2e95 100644
--- a/nss/nss-config.patch
+++ b/nss/nss-config.patch
@@ -1,6 +1,6 @@
 --- /dev/null
 +++ misc/build/nss-3.12.8/mozilla/security/nss/nss-config.in	2010-06-11 16:35:54.946870871 +0200
-@@ -0,0 +1,144 @@
+@@ -0,0 +1,147 @@
 +#!/bin/sh
 +
 +prefix=@prefix@
@@ -129,7 +129,10 @@
 +fi
 +
 +if test "$echo_libs" = "yes"; then
-+      libdirs="-Wl,-rpath-link,$libdir -L$libdir"
++      libdirs="-L$libdir"
++      if test `uname` != Darwin; then
++       libdirs="-Wl,-rpath-link,$libdir $libdirs"
++      fi
 +      if test -n "$lib_ssl"; then
 +	libdirs="$libdirs -lssl${major_version}"
 +      fi
-- 
cgit