<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[123758] trunk/dports/devel/icu</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/123758">123758</a></dd>
<dt>Author</dt> <dd>ryandesign@macports.org</dd>
<dt>Date</dt> <dd>2014-08-13 16:45:45 -0700 (Wed, 13 Aug 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>icu: do not use -rpath; it is not compatible with Tiger</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsdevelicuPortfile">trunk/dports/devel/icu/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportsdevelicufilespatchconfigmhdarwindiff">trunk/dports/devel/icu/files/patch-config-mh-darwin.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsdevelicuPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/devel/icu/Portfile (123757 => 123758)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/icu/Portfile 2014-08-13 23:19:13 UTC (rev 123757)
+++ trunk/dports/devel/icu/Portfile 2014-08-13 23:45:45 UTC (rev 123758)
</span><span class="lines">@@ -11,6 +11,7 @@
</span><span class="cx"> # To find dependencies, use:
</span><span class="cx"> # port file all | sort -u | xargs grep -E ':icu( |$)' | cut -d / -f 12 | sort -u
</span><span class="cx"> version 53.1
</span><ins>+revision 1
</ins><span class="cx"> categories devel textproc
</span><span class="cx"> platforms darwin freebsd
</span><span class="cx"> license MIT
</span><span class="lines">@@ -37,6 +38,8 @@
</span><span class="cx"> worksrcdir ${name}/source
</span><span class="cx"> set docdir ${prefix}/share/doc/${name}
</span><span class="cx">
</span><ins>+patchfiles patch-config-mh-darwin.diff
+
</ins><span class="cx"> # icu appends -O2 to the cflags and cxxflags
</span><span class="cx"> configure.optflags-delete -Os
</span><span class="cx">
</span><span class="lines">@@ -78,7 +81,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> # Removing architecture specific information from the Makefile include files is necessary to merge them correctly.
</span><del>- # It is concivable that this could cause problems for certain projects.
</del><ins>+ # It is conceivable that this could cause problems for certain projects.
</ins><span class="cx"> # The developers of ICU suggest using pkg-config over both icu-config and the Makefile includes.
</span><span class="cx"> reinplace {s| -DSIZEOF_VOID_P=[48]||g} ${dir}${prefix}/lib/icu/${version}/Makefile.inc
</span><span class="cx"> reinplace -E {s:-arch +[^ ]+::g} ${dir}${prefix}/lib/icu/${version}/pkgdata.inc
</span><span class="lines">@@ -93,19 +96,11 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-post-destroot {
- # The ICU build mechanism passes rpath to the linker, but this should not be necessary if the shared libraries were built correctly.
- reinplace {s|^default_ENABLE_RPATH="YES"$|default_ENABLE_RPATH="NO"|g} ${destroot}${prefix}/bin/icu-config
- reinplace -E {s| -Wl,-rpath,.+/lib||g} ${destroot}${prefix}/lib/icu/${version}/pkgdata.inc
-}
-
</del><span class="cx"> set platform [switch ${os.platform} {darwin {format MacOSX} freebsd {format FreeBSD}}]
</span><span class="cx"> configure.cmd ./runConfigureICU ${platform}
</span><span class="cx">
</span><del>-# enable-rpath forces ICU to build the shared library correctly (with directory name in -install_name)
</del><span class="cx"> configure.args --enable-static \
</span><del>- --disable-samples \
- --enable-rpath
</del><ins>+ --disable-samples
</ins><span class="cx">
</span><span class="cx"> configure.universal_args-delete --disable-dependency-tracking
</span><span class="cx"> if {[variant_isset universal]} {
</span></span></pre></div>
<a id="trunkdportsdevelicufilespatchconfigmhdarwindifffromrev120842trunkdportsdevelicufilespatchconfigmhdarwindiff"></a>
<div class="copfile"><h4>Copied: trunk/dports/devel/icu/files/patch-config-mh-darwin.diff (from rev 120842, trunk/dports/devel/icu/files/patch-config-mh-darwin.diff) (0 => 123758)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/icu/files/patch-config-mh-darwin.diff (rev 0)
+++ trunk/dports/devel/icu/files/patch-config-mh-darwin.diff 2014-08-13 23:45:45 UTC (rev 123758)
</span><span class="lines">@@ -0,0 +1,14 @@
</span><ins>+--- config/mh-darwin.orig 2012-09-10 19:00:37.000000000 -0500
++++ config/mh-darwin 2014-08-13 17:12:02.000000000 -0500
+@@ -28,11 +28,7 @@
+ SHLIB.cc= $(CXX) -dynamiclib -dynamic $(CXXFLAGS) $(LDFLAGS) $(LD_SOOPTIONS)
+
+ ## Compiler switches to embed a library name and version information
+-ifeq ($(ENABLE_RPATH),YES)
+ LD_SONAME = -Wl,-compatibility_version -Wl,$(SO_TARGET_VERSION_MAJOR) -Wl,-current_version -Wl,$(SO_TARGET_VERSION) -install_name $(libdir)/$(notdir $(MIDDLE_SO_TARGET))
+-else
+-LD_SONAME = -Wl,-compatibility_version -Wl,$(SO_TARGET_VERSION_MAJOR) -Wl,-current_version -Wl,$(SO_TARGET_VERSION) -install_name $(notdir $(MIDDLE_SO_TARGET))
+-endif
+
+ ## Compiler switch to embed a runtime search path
+ LD_RPATH=
</ins></span></pre></div>
<a id="trunkdportsdevelicufilespatchconfigmhdarwindiff"></a>
<div class="propset"><h4>Property changes: trunk/dports/devel/icu/files/patch-config-mh-darwin.diff</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="addfile"><h4>Added: svn:mergeinfo</h4></div>
<span class="cx">/users/cal/ports/devel/icu/files/patch-config-mh-darwin.diff:96570-97031
</span></div>
</body>
</html>