[110165] trunk/dports/python/py-zeroc-ice35
blair at macports.org
blair at macports.org
Tue Aug 27 11:55:55 PDT 2013
Revision: 110165
https://trac.macports.org/changeset/110165
Author: blair at macports.org
Date: 2013-08-27 11:55:55 -0700 (Tue, 27 Aug 2013)
Log Message:
-----------
py-zeroc-ice35: replace patch file with a symlink to a zeroc-ice35 patch.
This makes the port easier to maintain than redoing work.
Modified Paths:
--------------
trunk/dports/python/py-zeroc-ice35/Portfile
Added Paths:
-----------
trunk/dports/python/py-zeroc-ice35/files/patch-ice.cpp.config.Make.rules.Darwin.diff
trunk/dports/python/py-zeroc-ice35/files/patch-ice.py.config.Make.rules.Darwin.diff
Removed Paths:
-------------
trunk/dports/python/py-zeroc-ice35/files/patch-cpp.config.Make.rules.Darwin.diff
trunk/dports/python/py-zeroc-ice35/files/patch-py.config.Make.rules.Darwin.diff
Modified: trunk/dports/python/py-zeroc-ice35/Portfile
===================================================================
--- trunk/dports/python/py-zeroc-ice35/Portfile 2013-08-27 18:46:47 UTC (rev 110164)
+++ trunk/dports/python/py-zeroc-ice35/Portfile 2013-08-27 18:55:55 UTC (rev 110165)
@@ -36,8 +36,10 @@
distname Ice-${version}
checksums sha1 8501afaf86c0d62192cfc1b83c338178f73e98e9 \
sha256 583d4a819d50ad8b79b1e9ad45abfa3078f981486271ca8cd9ede8fa420ff575
-patchfiles patch-cpp.config.Make.rules.Darwin.diff \
- patch-py.config.Make.rules.Darwin.diff
+patchfiles patch-ice.cpp.config.Make.rules.Darwin.diff \
+ patch-ice.py.config.Make.rules.Darwin.diff
+patch.pre_args -p1
+
platforms darwin
python.versions 25 26 27
Deleted: 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 2013-08-27 18:46:47 UTC (rev 110164)
+++ trunk/dports/python/py-zeroc-ice35/files/patch-cpp.config.Make.rules.Darwin.diff 2013-08-27 18:55:55 UTC (rev 110165)
@@ -1,36 +0,0 @@
-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
Added: 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 (rev 0)
+++ trunk/dports/python/py-zeroc-ice35/files/patch-ice.cpp.config.Make.rules.Darwin.diff 2013-08-27 18:55:55 UTC (rev 110165)
@@ -0,0 +1 @@
+link ../../../devel/zeroc-ice35/files/patch-ice.cpp.config.Make.rules.Darwin.diff
\ No newline at end of file
Property changes on: trunk/dports/python/py-zeroc-ice35/files/patch-ice.cpp.config.Make.rules.Darwin.diff
___________________________________________________________________
Added: svn:special
+ *
Copied: trunk/dports/python/py-zeroc-ice35/files/patch-ice.py.config.Make.rules.Darwin.diff (from rev 110162, trunk/dports/python/py-zeroc-ice35/files/patch-py.config.Make.rules.Darwin.diff)
===================================================================
--- trunk/dports/python/py-zeroc-ice35/files/patch-ice.py.config.Make.rules.Darwin.diff (rev 0)
+++ trunk/dports/python/py-zeroc-ice35/files/patch-ice.py.config.Make.rules.Darwin.diff 2013-08-27 18:55:55 UTC (rev 110165)
@@ -0,0 +1,12 @@
+diff -ru Ice-3.5.0.orig/py/config/Make.rules.Darwin Ice-3.5.0/py/config/Make.rules.Darwin
+--- Ice-3.5.0.orig/py/config/Make.rules.Darwin 2013-03-11 08:19:47.000000000 -0700
++++ Ice-3.5.0/py/config/Make.rules.Darwin 2013-08-27 11:50:52.000000000 -0700
+@@ -24,7 +24,7 @@
+ ifeq ($(shell test ! -f $(PYTHON_HOME)/Python && echo 0),0)
+ $(error Unable to find Python framework See config/Make.rules.Darwin)
+ endif
+- PYTHON_LIBS = -F$(patsubst %/Python.framework/Versions/,%,$(dir $(PYTHON_HOME))) -framework Python
++ PYTHON_LIBS = $(PYTHON_HOME)/Python
+ else
+ XCODE_PATH = $(shell xcode-select --print-path)
+ SDKS_DIR = $(XCODE_PATH)/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk
Deleted: trunk/dports/python/py-zeroc-ice35/files/patch-py.config.Make.rules.Darwin.diff
===================================================================
--- trunk/dports/python/py-zeroc-ice35/files/patch-py.config.Make.rules.Darwin.diff 2013-08-27 18:46:47 UTC (rev 110164)
+++ trunk/dports/python/py-zeroc-ice35/files/patch-py.config.Make.rules.Darwin.diff 2013-08-27 18:55:55 UTC (rev 110165)
@@ -1,11 +0,0 @@
---- py/config/Make.rules.Darwin.orig 2013-08-25 20:21:37.000000000 -0400
-+++ py/config/Make.rules.Darwin 2013-08-25 20:22:28.000000000 -0400
-@@ -24,7 +24,7 @@
- ifeq ($(shell test ! -f $(PYTHON_HOME)/Python && echo 0),0)
- $(error Unable to find Python framework See config/Make.rules.Darwin)
- endif
-- PYTHON_LIBS = -F$(patsubst %/Python.framework/Versions/,%,$(dir $(PYTHON_HOME))) -framework Python
-+ PYTHON_LIBS = $(PYTHON_HOME)/Python
- else
- XCODE_PATH = $(shell xcode-select --print-path)
- SDKS_DIR = $(XCODE_PATH)/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130827/d3f341cd/attachment.html>
More information about the macports-changes
mailing list