[110213] trunk/dports/python/py-zeroc-ice35/files

[blair at macports.org]

Revision: 110213
          https://trac.macports.org/changeset/110213
Author:   blair at macports.org
Date:     2013-08-28 09:37:22 -0700 (Wed, 28 Aug 2013)
Log Message:
-----------
py-zeroc-ice35: replace symlink to patch with copy of patch.

Since 'port sync' against an rsync repository doesn't sync the
symlinks, make a copy of the the patch.

I considered using a file svn:external, but that won't work with older
Subversion clients, such as /usr/bin/svn 1.4.4 provided by Mac OS X
10.5.8.

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

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

Deleted: trunk/dports/python/py-zeroc-ice35/files/patch-ice.cpp.config.Make.rules.Darwin.diff
===================================================================
--- trunk/dports/python/py-zeroc-ice35/files/patch-ice.cpp.config.Make.rules.Darwin.diff	2013-08-28 16:30:23 UTC (rev 110212)
+++ trunk/dports/python/py-zeroc-ice35/files/patch-ice.cpp.config.Make.rules.Darwin.diff	2013-08-28 16:37:22 UTC (rev 110213)
@@ -1 +0,0 @@
-link ../../../devel/zeroc-ice35/files/patch-ice.cpp.config.Make.rules.Darwin.diff
\ No newline at end of file

Copied: trunk/dports/python/py-zeroc-ice35/files/patch-ice.cpp.config.Make.rules.Darwin.diff (from rev 110212, trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.config.Make.rules.Darwin.diff)
===================================================================
--- trunk/dports/python/py-zeroc-ice35/files/patch-ice.cpp.config.Make.rules.Darwin.diff	                        (rev 0)
+++ trunk/dports/python/py-zeroc-ice35/files/patch-ice.cpp.config.Make.rules.Darwin.diff	2013-08-28 16:37:22 UTC (rev 110213)
@@ -0,0 +1,39 @@
+NOTE: keep this patch in sync between zeroc-ice35 and py-zeroc-ice35.
+
+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.
+
+diff -ru Ice-3.5.0.orig/cpp/config/Make.rules.Darwin Ice-3.5.0/cpp/config/Make.rules.Darwin
+--- Ice-3.5.0.orig/cpp/config/Make.rules.Darwin	2013-03-11 08:19:46.000000000 -0700
++++ Ice-3.5.0/cpp/config/Make.rules.Darwin	2013-03-11 21:30:00.269042661 -0700
+@@ -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


Property changes on: trunk/dports/python/py-zeroc-ice35/files/patch-ice.cpp.config.Make.rules.Darwin.diff
___________________________________________________________________
Added: svn:mergeinfo
   + /branches/mld-qt-481/dports/devel/zeroc-ice35/files/patch-ice.cpp.config.Make.rules.Darwin.diff:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
/users/cal/ports/devel/zeroc-ice35/files/patch-ice.cpp.config.Make.rules.Darwin.diff:96570-97031
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130828/12b0c8cf/attachment.html>