<!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>[131326] trunk/dports/lang/perl5.18</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/131326">131326</a></dd>
<dt>Author</dt> <dd>larryv@macports.org</dd>
<dt>Date</dt> <dd>2015-01-09 12:14:49 -0800 (Fri, 09 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>perl5.18: Fix `Config{ld}` on newer OSes (<a href="https://trac.macports.org/changeset/131305">r131305</a>)
Also bring over some other fixes from `perl5.16`.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportslangperl518Portfile">trunk/dports/lang/perl5.18/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportslangperl518filesavoidbind9linkingpatch">trunk/dports/lang/perl5.18/files/avoid-bind9-linking.patch</a></li>
<li><a href="#trunkdportslangperl518filesavoidnocppprecompPR38913patch">trunk/dports/lang/perl5.18/files/avoid-no-cpp-precomp-PR38913.patch</a></li>
<li><a href="#trunkdportslangperl518filescleanuppathspatch">trunk/dports/lang/perl5.18/files/clean-up-paths.patch</a></li>
<li><a href="#trunkdportslangperl518filesfixldmodificationpatch">trunk/dports/lang/perl5.18/files/fix-ld-modification.patch</a></li>
<li><a href="#trunkdportslangperl518filesfixminiperllinkingPR36438patch">trunk/dports/lang/perl5.18/files/fix-miniperl-linking-PR36438.patch</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportslangperl518Portfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/lang/perl5.18/Portfile (131325 => 131326)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/perl5.18/Portfile 2015-01-09 20:08:48 UTC (rev 131325)
+++ trunk/dports/lang/perl5.18/Portfile 2015-01-09 20:14:49 UTC (rev 131326)
</span><span class="lines">@@ -6,6 +6,7 @@
</span><span class="cx"> name perl5.18
</span><span class="cx"> version 5.18.4
</span><span class="cx"> set branch [join [lrange [split ${version} .] 0 1] .]
</span><ins>+revision 1
</ins><span class="cx"> categories lang
</span><span class="cx"> platforms darwin freebsd linux
</span><span class="cx"> license {Artistic-1 GPL}
</span><span class="lines">@@ -28,10 +29,22 @@
</span><span class="cx"> checksums rmd160 d97181a98f7acc80125b0d2a182a6a2cd7542ceb \
</span><span class="cx"> sha256 1fb4d27b75cd244e849f253320260efe1750641aaff4a18ce0d67556ff1b96a5
</span><span class="cx">
</span><del>-patchfiles install-under-short-version-PR43480.patch
</del><ins>+patchfiles clean-up-paths.patch \
+ avoid-no-cpp-precomp-PR38913.patch \
+ install-under-short-version-PR43480.patch \
+ fix-ld-modification.patch
</ins><span class="cx">
</span><ins>+# Prevent build from picking up the bind9 port's static libbind, which
+# duplicates symbols from /usr/lib/libdl (r10638).
+patchfiles-append avoid-bind9-linking.patch
+
+# Prevent miniperl linking from accidentally finding our libstdc++
+# (#36438).
+patchfiles-append fix-miniperl-linking-PR36438.patch
+
</ins><span class="cx"> post-patch {
</span><del>- reinplace "s|/opt/local|${prefix}|g" ${worksrcpath}/Configure
</del><ins>+ reinplace -W ${worksrcpath} "s|__PREFIX__|${prefix}|g" \
+ Configure Makefile.SH
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> configure.ccache no
</span><span class="lines">@@ -52,7 +65,7 @@
</span><span class="cx"> -Dusethreads \
</span><span class="cx"> -Duseshrplib \
</span><span class="cx"> {-Dcc="$CC"} \
</span><del>- {-Dld="$CC"} \
</del><ins>+ {-Dld="env MACOSX_DEPLOYMENT_TARGET=$MACOSX_DEPLOYMENT_TARGET $CC"} \
</ins><span class="cx"> -Dman1ext=1pm \
</span><span class="cx"> -Dman3ext=3pm \
</span><span class="cx"> -Dman1dir='${prefix}/share/man/man1p' \
</span></span></pre></div>
<a id="trunkdportslangperl518filesavoidbind9linkingpatchfromrev131325trunkdportslangperl516filesavoidbind9linkingpatch"></a>
<div class="copfile"><h4>Copied: trunk/dports/lang/perl5.18/files/avoid-bind9-linking.patch (from rev 131325, trunk/dports/lang/perl5.16/files/avoid-bind9-linking.patch) (0 => 131326)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/perl5.18/files/avoid-bind9-linking.patch (rev 0)
+++ trunk/dports/lang/perl5.18/files/avoid-bind9-linking.patch 2015-01-09 20:14:49 UTC (rev 131326)
</span><span class="lines">@@ -0,0 +1,13 @@
</span><ins>+Index: hints/darwin.sh
+===================================================================
+--- hints/darwin.sh.orig
++++ hints/darwin.sh
+@@ -315,6 +315,8 @@ i_dbm=undef;
+ # NeilW says this should be acceptable on all darwin versions.
+ ranlib='ranlib'
+
++libswanted="$(echo $libswanted | sed -e 's/bind //' -e 's/ bind//')"
++
+ ##
+ # Build process
+ ##
</ins></span></pre></div>
<a id="trunkdportslangperl518filesavoidnocppprecompPR38913patchfromrev131325trunkdportslangperl516filesavoidnocppprecompPR38913patch"></a>
<div class="copfile"><h4>Copied: trunk/dports/lang/perl5.18/files/avoid-no-cpp-precomp-PR38913.patch (from rev 131325, trunk/dports/lang/perl5.16/files/avoid-no-cpp-precomp-PR38913.patch) (0 => 131326)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/perl5.18/files/avoid-no-cpp-precomp-PR38913.patch (rev 0)
+++ trunk/dports/lang/perl5.18/files/avoid-no-cpp-precomp-PR38913.patch 2015-01-09 20:14:49 UTC (rev 131326)
</span><span class="lines">@@ -0,0 +1,13 @@
</span><ins>+Index: hints/darwin.sh
+===================================================================
+--- hints/darwin.sh.orig
++++ hints/darwin.sh
+@@ -129,8 +129,6 @@ esac
+
+ # Avoid Apple's cpp precompiler, better for extensions
+ if [ "X`echo | ${cc} -no-cpp-precomp -E - 2>&1 >/dev/null`" = "X" ]; then
+- cppflags="${cppflags} -no-cpp-precomp"
+-
+ # This is necessary because perl's build system doesn't
+ # apply cppflags to cc compile lines as it should.
+ ccflags="${ccflags} ${cppflags}"
</ins></span></pre></div>
<a id="trunkdportslangperl518filescleanuppathspatchfromrev131325trunkdportslangperl516filescleanuppathspatch"></a>
<div class="copfile"><h4>Copied: trunk/dports/lang/perl5.18/files/clean-up-paths.patch (from rev 131325, trunk/dports/lang/perl5.16/files/clean-up-paths.patch) (0 => 131326)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/perl5.18/files/clean-up-paths.patch (rev 0)
+++ trunk/dports/lang/perl5.18/files/clean-up-paths.patch 2015-01-09 20:14:49 UTC (rev 131326)
</span><span class="lines">@@ -0,0 +1,39 @@
</span><ins>+Index: Configure
+===================================================================
+--- Configure.orig
++++ Configure
+@@ -106,8 +106,8 @@ if test -d c:/. || ( uname -a | grep -i
+ fi
+
+ : Proper PATH setting
+-paths='/bin /usr/bin /usr/local/bin /usr/ucb /usr/local /usr/lbin'
+-paths="$paths /opt/bin /opt/local/bin /opt/local /opt/lbin"
++paths='/bin /usr/bin /usr/ucb /usr/lbin'
++paths="$paths /opt/bin __PREFIX__/bin __PREFIX__ /opt/lbin"
+ paths="$paths /usr/5bin /etc /usr/gnu/bin /usr/new /usr/new/bin /usr/nbin"
+ paths="$paths /opt/gnu/bin /opt/new /opt/new/bin /opt/nbin"
+ paths="$paths /sys5.3/bin /sys5.3/usr/bin /bsd4.3/bin /bsd4.3/usr/ucb"
+@@ -1328,7 +1328,7 @@ archobjs=''
+ archname=''
+ : Possible local include directories to search.
+ : Set locincpth to "" in a hint file to defeat local include searches.
+-locincpth="/usr/local/include /opt/local/include /usr/gnu/include"
++locincpth="__PREFIX__/include /usr/gnu/include"
+ locincpth="$locincpth /opt/gnu/include /usr/GNU/include /opt/GNU/include"
+ :
+ : no include file wanted by default
+@@ -1342,12 +1342,12 @@ libnames=''
+ : change the next line if compiling for Xenix/286 on Xenix/386
+ xlibpth='/usr/lib/386 /lib/386'
+ : Possible local library directories to search.
+-loclibpth="/usr/local/lib /opt/local/lib /usr/gnu/lib"
++loclibpth="__PREFIX__/lib /usr/gnu/lib"
+ loclibpth="$loclibpth /opt/gnu/lib /usr/GNU/lib /opt/GNU/lib"
+
+ : general looking path for locating libraries
+ glibpth="/lib /usr/lib $xlibpth"
+-glibpth="$glibpth /usr/ccs/lib /usr/ucblib /usr/local/lib"
++glibpth="$glibpth /usr/ccs/lib /usr/ucblib"
+ test -f /usr/shlib/libc.so && glibpth="/usr/shlib $glibpth"
+ test -f /shlib/libc.so && glibpth="/shlib $glibpth"
+ test -d /usr/lib64 && glibpth="$glibpth /lib64 /usr/lib64 /usr/local/lib64"
</ins></span></pre></div>
<a id="trunkdportslangperl518filesfixldmodificationpatchfromrev131325trunkdportslangperl516filesfixldmodificationpatch"></a>
<div class="copfile"><h4>Copied: trunk/dports/lang/perl5.18/files/fix-ld-modification.patch (from rev 131325, trunk/dports/lang/perl5.16/files/fix-ld-modification.patch) (0 => 131326)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/perl5.18/files/fix-ld-modification.patch (rev 0)
+++ trunk/dports/lang/perl5.18/files/fix-ld-modification.patch 2015-01-09 20:14:49 UTC (rev 131326)
</span><span class="lines">@@ -0,0 +1,21 @@
</span><ins>+Index: hints/darwin.sh
+===================================================================
+--- hints/darwin.sh.orig
++++ hints/darwin.sh
+@@ -141,7 +141,6 @@ esac
+
+ # Shared library extension is .dylib.
+ # Bundle extension is .bundle.
+-ld='cc';
+ so='dylib';
+ dlext='bundle';
+ usedl='define';
+@@ -182,7 +181,7 @@ case "$osvers" in
+ *)
+ lddlflags="${ldflags} -bundle -undefined dynamic_lookup"
+ case "$ld" in
+- *MACOSX_DEVELOPMENT_TARGET*) ;;
++ *MACOSX_DEPLOYMENT_TARGET*) ;;
+ *) ld="env MACOSX_DEPLOYMENT_TARGET=10.3 ${ld}" ;;
+ esac
+ ;;
</ins></span></pre></div>
<a id="trunkdportslangperl518filesfixminiperllinkingPR36438patchfromrev131325trunkdportslangperl516filesfixminiperllinkingPR36438patch"></a>
<div class="copfile"><h4>Copied: trunk/dports/lang/perl5.18/files/fix-miniperl-linking-PR36438.patch (from rev 131325, trunk/dports/lang/perl5.16/files/fix-miniperl-linking-PR36438.patch) (0 => 131326)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/perl5.18/files/fix-miniperl-linking-PR36438.patch (rev 0)
+++ trunk/dports/lang/perl5.18/files/fix-miniperl-linking-PR36438.patch 2015-01-09 20:14:49 UTC (rev 131326)
</span><span class="lines">@@ -0,0 +1,14 @@
</span><ins>+Index: Makefile.SH
+===================================================================
+--- Makefile.SH.orig
++++ Makefile.SH
+@@ -870,7 +870,8 @@ NAMESPACEFLAGS = -force_flat_namespace
+ $spitshell >>$Makefile <<'!NO!SUBS!'
+ $(MINIPERL_EXE): $& $(mini_obj)
+ -@rm -f miniperl.xok
+- $(CC) $(CLDFLAGS) $(NAMESPACEFLAGS) -o $(MINIPERL_EXE) \
++ unset LIBRARY_PATH && \
++ $(CC) $(subst -L__PREFIX__/lib,,$(CLDFLAGS)) $(NAMESPACEFLAGS) -o $(MINIPERL_EXE) \
+ $(mini_obj) $(libs)
+ $(LDLIBPTH) $(RUN) ./miniperl$(HOST_EXE_EXT) -w -Ilib -MExporter -e '<?>' || $(MAKE) minitest
+ !NO!SUBS!
</ins></span></pre>
</div>
</div>
</body>
</html>