<!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>[113984] trunk/dports/science/htcondor</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/113984">113984</a></dd>
<dt>Author</dt> <dd>aronnax@macports.org</dd>
<dt>Date</dt> <dd>2013-11-26 17:19:53 -0800 (Tue, 26 Nov 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>htcondor: revert <a href="https://trac.macports.org/changeset/113983">r113983</a>, broke build (sorry, should have committed to a branch)</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportssciencehtcondorPortfile">trunk/dports/science/htcondor/Portfile</a></li>
<li><a href="#trunkdportssciencehtcondorfilespatchbuildcmakeCondorConfigurecmakediff">trunk/dports/science/htcondor/files/patch-build-cmake-CondorConfigure.cmake.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportssciencehtcondorPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/science/htcondor/Portfile (113983 => 113984)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/htcondor/Portfile 2013-11-27 00:56:41 UTC (rev 113983)
+++ trunk/dports/science/htcondor/Portfile 2013-11-27 01:19:53 UTC (rev 113984)
</span><span class="lines">@@ -10,7 +10,7 @@
</span><span class="cx"> github.setup htcondor htcondor 8_1_1 V
</span><span class="cx"> version [strsed ${github.version} g/_/\./]
</span><span class="cx"> maintainers aronnax
</span><del>-revision 2
</del><ins>+revision 3
</ins><span class="cx">
</span><span class="cx"> categories science parallel net
</span><span class="cx"> license apache
</span></span></pre></div>
<a id="trunkdportssciencehtcondorfilespatchbuildcmakeCondorConfigurecmakediff"></a>
<div class="modfile"><h4>Modified: trunk/dports/science/htcondor/files/patch-build-cmake-CondorConfigure.cmake.diff (113983 => 113984)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/htcondor/files/patch-build-cmake-CondorConfigure.cmake.diff 2013-11-27 00:56:41 UTC (rev 113983)
+++ trunk/dports/science/htcondor/files/patch-build-cmake-CondorConfigure.cmake.diff 2013-11-27 01:19:53 UTC (rev 113984)
</span><span class="lines">@@ -1,17 +1,32 @@
</span><del>---- build/cmake/CondorConfigure.cmake.orig 2013-11-26 16:39:01.000000000 -0800
-+++ build/cmake/CondorConfigure.cmake 2013-11-26 16:41:44.000000000 -0800
-@@ -273,10 +273,10 @@
- # Clang requires some additional C++11 flags, as the default stdlib
- # is from an old GCC version.
- if ( ${OS_NAME} STREQUAL "DARWIN" AND "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" )
</del><ins>+--- build/cmake/CondorConfigure.cmake.orig 2013-10-27 19:39:00.000000000 -0700
++++ build/cmake/CondorConfigure.cmake 2013-10-27 19:40:24.000000000 -0700
+@@ -270,15 +270,6 @@
+ check_cxx_compiler_flag(-std=c++11 cxx_11)
+ if (cxx_11)
+
+- # Clang requires some additional C++11 flags, as the default stdlib
+- # is from an old GCC version.
+- if ( ${OS_NAME} STREQUAL "DARWIN" AND "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" )
</ins><span class="cx"> - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++ -lc++")
</span><span class="cx"> - set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -lc++")
</span><span class="cx"> - set(CMAKE_STATIC_LINKER_FLAGS "${CMAKE_STATIC_LINKER_FLAGS} -lc++")
</span><span class="cx"> - set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -lc++")
</span><del>-+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++")
-+ set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS}")
-+ set(CMAKE_STATIC_LINKER_FLAGS "${CMAKE_STATIC_LINKER_FLAGS}")
-+ set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS}")
- endif()
</del><ins>+- endif()
+-
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
</ins><span class="cx">
</span><del>- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
</del><ins>+ check_cxx_source_compiles("
+@@ -291,13 +282,6 @@
+ }
+ " PREFER_CPP11 )
+
+- # Note - without adding -lc++ to the CXX flags, the linking of the test
+- # above will fail for clang. It doesn't seem strictly necessary though,
+- # so we remove this afterward.
+- if ( ${OS_NAME} STREQUAL "DARWIN" AND "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" )
+- string(REPLACE "-lc++" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
+- endif()
+-
+ endif (cxx_11)
+
+ if (NOT PREFER_CPP11)
</ins></span></pre>
</div>
</div>
</body>
</html>