[110163] trunk/dports/python/py-zeroc-ice35/files/patch-cpp.config.Make. rules.Darwin.diff

[blair at macports.org]

Revision: 110163
          https://trac.macports.org/changeset/110163
Author:   blair at macports.org
Date:     2013-08-27 11:45:51 -0700 (Tue, 27 Aug 2013)
Log Message:
-----------
py-zeroc-ice35: follow up to r110162: add new patch file.

Revision Links:
--------------
    https://trac.macports.org/changeset/110162

Added Paths:
-----------
    trunk/dports/python/py-zeroc-ice35/files/patch-cpp.config.Make.rules.Darwin.diff

Added: trunk/dports/python/py-zeroc-ice35/files/patch-cpp.config.Make.rules.Darwin.diff
===================================================================
--- trunk/dports/python/py-zeroc-ice35/files/patch-cpp.config.Make.rules.Darwin.diff	                        (rev 0)
+++ trunk/dports/python/py-zeroc-ice35/files/patch-cpp.config.Make.rules.Darwin.diff	2013-08-27 18:45:51 UTC (rev 110163)
@@ -0,0 +1,36 @@
+Changes:
+
+1) Allow environment to set CXX.
+2) Do not build for both i386 and x86_64 since MacPorts' universal
+   configuration will specify which architectures to build for.
+
+--- cpp/config/Make.rules.Darwin.orig	2013-08-25 20:30:54.000000000 -0400
++++ cpp/config/Make.rules.Darwin	2013-08-25 20:31:46.000000000 -0400
+@@ -11,17 +11,11 @@
+ # This file is included by Make.rules when uname is Darwin.
+ #
+ 
+-CXX			= xcrun clang++
++CXX			?= xcrun clang++
+ 
+ CXXFLAGS		= -Wall -Werror -D_REENTRANT
+ 
+ ifeq ($(OPTIMIZE),yes)
+-     #
+-     # By default we build binaries with both architectures when optimization is enabled.
+-     #
+-     ifeq ($(CXXARCHFLAGS),)
+-     	CXXARCHFLAGS	:= -arch i386 -arch x86_64
+-     endif   
+      CXXFLAGS		:= $(CXXARCHFLAGS) -O2 -DNDEBUG $(CXXFLAGS)
+ else
+      CXXFLAGS		:= $(CXXARCHFLAGS) -g $(CXXFLAGS)
+@@ -72,7 +66,7 @@
+ ICEUTIL_OS_LIBS         = -lpthread
+ ICE_OS_LIBS             = -ldl
+ 
+-PLATFORM_HAS_READLINE   := no
++PLATFORM_HAS_READLINE   := yes
+ 
+ #
+ # QT is used only for the deprecated IceGrid and IceStorm SQL plugins
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130827/32eb842f/attachment.html>