[110315] trunk/dports/python/py-zeroc-ice35
blair at macports.org
blair at macports.org
Thu Aug 29 14:38:13 PDT 2013
Revision: 110315
https://trac.macports.org/changeset/110315
Author: blair at macports.org
Date: 2013-08-29 14:38:13 -0700 (Thu, 29 Aug 2013)
Log Message:
-----------
py-zeroc-ice35: sync patch-ice.cpp.config.Make.rules.Darwin.diff.
Modified Paths:
--------------
trunk/dports/python/py-zeroc-ice35/Portfile
trunk/dports/python/py-zeroc-ice35/files/patch-ice.cpp.config.Make.rules.Darwin.diff
Modified: trunk/dports/python/py-zeroc-ice35/Portfile
===================================================================
--- trunk/dports/python/py-zeroc-ice35/Portfile 2013-08-29 21:35:59 UTC (rev 110314)
+++ trunk/dports/python/py-zeroc-ice35/Portfile 2013-08-29 21:38:13 UTC (rev 110315)
@@ -5,7 +5,7 @@
name py-zeroc-ice35
version 3.5.0
-revision 2
+revision 3
set branch [join [lrange [split ${version} .] 0 1] .]
categories-append devel
maintainers blair
Modified: 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-29 21:35:59 UTC (rev 110314)
+++ trunk/dports/python/py-zeroc-ice35/files/patch-ice.cpp.config.Make.rules.Darwin.diff 2013-08-29 21:38:13 UTC (rev 110315)
@@ -5,10 +5,13 @@
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.
+3) Do not define -DMAC_OS_X_VERSION_MIN_REQUIRED=MAC_OS_X_VERSION_10_6
+ so that any Mac OS X version can be used. Since we link against
+ MacPorts' OpenSSL, this flag is unnecessary.
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
++++ Ice-3.5.0/cpp/config/Make.rules.Darwin 2013-08-29 12:42:04.000000000 -0700
@@ -11,17 +11,11 @@
# This file is included by Make.rules when uname is Darwin.
#
@@ -28,7 +31,19 @@
CXXFLAGS := $(CXXARCHFLAGS) -O2 -DNDEBUG $(CXXFLAGS)
else
CXXFLAGS := $(CXXARCHFLAGS) -g $(CXXFLAGS)
-@@ -72,7 +66,7 @@
+@@ -59,11 +53,6 @@
+
+ mkshlib = $(CXX) -dynamiclib $(shlibldflags) -o $(1) -install_name @rpath/$(2) $(3) $(4)
+
+-#
+-# Avoid OpenSSL deprecation warnings on OS X
+-#
+-OPENSSL_FLAGS = -DMAC_OS_X_VERSION_MIN_REQUIRED=MAC_OS_X_VERSION_10_6
+-
+ BASELIBS = -lIceUtil -lpthread
+ LIBS = -lIce $(BASELIBS)
+
+@@ -72,7 +61,7 @@
ICEUTIL_OS_LIBS = -lpthread
ICE_OS_LIBS = -ldl
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130829/2dafd625/attachment.html>
More information about the macports-changes
mailing list