<!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>[49121] trunk/dports/devel/openssl/Portfile</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="http://trac.macports.org/changeset/49121">49121</a></dd>
<dt>Author</dt> <dd>mcalhoun@macports.org</dd>
<dt>Date</dt> <dd>2009-04-03 23:05:05 -0700 (Fri, 03 Apr 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>openssl: Simplify universal build by using muniversal PortGroup.
Fixes #19002 (maintainer timeout).</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsdevelopensslPortfile">trunk/dports/devel/openssl/Portfile</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsdevelopensslPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/devel/openssl/Portfile (49120 => 49121)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/openssl/Portfile 2009-04-04 05:52:57 UTC (rev 49120)
+++ trunk/dports/devel/openssl/Portfile 2009-04-04 06:05:05 UTC (rev 49121)
</span><span class="lines">@@ -1,6 +1,7 @@
</span><span class="cx"> # $Id$
</span><span class="cx">
</span><span class="cx"> PortSystem 1.0
</span><ins>+PortGroup muniversal 1.0
</ins><span class="cx">
</span><span class="cx"> name openssl
</span><span class="cx"> version 0.9.8k
</span><span class="lines">@@ -52,135 +53,45 @@
</span><span class="cx"> livecheck.url ${master_sites}
</span><span class="cx"> livecheck.regex ${name}-(0.9.8\[a-z\])
</span><span class="cx">
</span><del>-if { ![info exists universal_archs] } {
- set universal_archs {i386 ppc}
- #set universal_archs {i386 x86_64 ppc ppc64}
</del><ins>+post-patch {
+ # Ensure that the correct compiler is used
+ reinplace "s|cc:|${configure.cc}:|" ${worksrcpath}/Configure
</ins><span class="cx"> }
</span><del>-set first_arch [lindex ${universal_archs} 0]
</del><span class="cx">
</span><del>-variant universal {
- patchfiles-append patch-Configure-sysroot.diff
</del><ins>+if { [variant_isset universal] } {
+ configure.cmd ./Configure
+
</ins><span class="cx"> post-patch {
</span><del>- reinplace "s|__UNIVERSAL_SYSROOT__|${universal_sysroot}|" ${worksrcpath}/Configure
- foreach arch ${universal_archs} {
- if {[string equal ${arch} ${first_arch}]} {
- move ${worksrcpath} ${workpath}/${first_arch}
- } else {
- copy ${workpath}/${first_arch} ${workpath}/${arch}
- }
- }
</del><ins>+ # For universal builds, add "-isysroot ${universal_sysroot}" to compiler options
+ reinplace "s|\\(-arch \[_a-zA-Z0-9\]*\\)|\\1 -isysroot ${universal_sysroot}|" ${worksrcpath}/Configure
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- configure {
- foreach arch ${universal_archs} {
- if { [string first 64 $arch] == -1 } {
- set my_cc "darwin-${arch}-cc"
- } else {
- if {[string first ppc $arch] != -1} {
- set my_cc "darwin64-ppc-cc"
- } else {
- set my_cc "darwin64-${arch}-cc"
- }
- }
- system "cd ${workpath}/${arch} && ./Configure ${my_cc} ${configure.pre_args} ${configure.args}"
- }
</del><ins>+ set merger_arch_compiler "no"
+
+ pre-configure {
+ configure.args-delete --disable-dependency-tracking
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- build {
- foreach arch ${universal_archs} {
- system "cd ${workpath}/${arch} && make all"
</del><ins>+ pre-destroot {
+ global merger_dont_diff
+ if { [llength ${universal_archs_to_use}] > 2 } {
+ lappend merger_dont_diff ${prefix}/include/openssl/opensslconf.h
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- destroot {
-# in port 1.7, just call:
-# merge "${workpath}/pre-dest"
-# till then, do this:
- foreach arch ${universal_archs} {
- xinstall -d ${workpath}/pre-dest/${arch}
- system "cd ${workpath}/${arch} && make install INSTALL_PREFIX=${workpath}/pre-dest/${arch} MANDIR=${prefix}/share/man"
-
- # opensslconf.h will differ between 32- and 64-bit, so patch it so it doesn't
- if { [string first 64 $arch] != -1 } {
- if { [string first ppc $arch] != -1 } {
- set configpatch ${filespath}/patch-opensslconf.h-ppc64.diff
- } else {
- set configpatch ${filespath}/patch-opensslconf.h-x86_64.diff
- }
- } else {
- set configpatch ${filespath}/patch-opensslconf.h-32.diff
- }
- system "cd ${workpath}/pre-dest/${arch}${prefix} && patch --no-backup-if-mismatch -p0 < ${configpatch}"
- }
</del><ins>+ array set merger_configure_args {
+ ppc darwin-ppc-cc
+ i386 darwin-i386-cc
+ ppc64 darwin64-ppc-cc
+ x86_64 darwin64-x86_64-cc
+ }
</ins><span class="cx">
</span><del>- set basepath "${workpath}/pre-dest/${first_arch}"
- fs-traverse file "${basepath}" {
- set fpath [string range "${file}" [string length "${basepath}"] [string length "${file}"]]
- if {${fpath} != ""} {
- ui_debug ":: ${fpath}"
-
- switch -exact [file type "${basepath}${fpath}"] {
- directory {
- # just create directories
- ui_debug "-- dir:: ${fpath}"
- file mkdir "${destroot}${fpath}"
- }
- link {
- # copy symlinks (TODO: check if target matches)
- ui_debug "-- lnk:: ${fpath}"
- file copy "${basepath}${fpath}" "${destroot}${fpath}"
- }
- file {
- # treat files depending on their filetype
- ui_debug "-- file:: ${fpath}"
- set filetype [exec "/usr/bin/file" "-b" "${basepath}${fpath}"]
- switch -regexp ${filetype} {
- Mach-O.* {
- # Mach-O binaries get lipo-ed
- ui_debug "Mach-O file -- lipo-ing"
- set machocmd "lipo"
- foreach arch ${universal_archs} {
- set machocmd "${machocmd} -arch $arch ${workpath}/pre-dest/${arch}/${fpath}"
- }
- set machocmd "${machocmd} -create -output ${destroot}${fpath}"
- system ${machocmd}
- }
- current\ ar\ archive {
- # ar archives get lipo-ed
- ui_debug "ar archive -- lipo-ing"
- set arcmd "lipo"
- foreach arch ${universal_archs} {
- set arcmd "${arcmd} -arch $arch ${workpath}/pre-dest/${arch}/${fpath}"
- }
- set arcmd "${arcmd} -create -output ${destroot}${fpath}"
- system ${arcmd}
- }
- default {
- # unknown file types are copied IF they do not differ across ALL architectures -- if they do: This is an error!
- ui_debug "unknown filetype: ${filetype}"
-
- set any_difference no
- foreach arch ${universal_archs} {
- if {![string equal ${arch} ${first_arch}]} {
- set differ1 [exec "/usr/bin/diff" "-q" "${workpath}/pre-dest/${first_arch}/${fpath}" "${workpath}/pre-dest/${arch}/${fpath}"]
- if {![string equal ${differ1} ""]} {
- set any_difference yes
- }
- }
- }
- if {${any_difference}} {
- ui_debug "ERROR: files differ"
- } else {
- ui_debug "files match, just copying"
- file copy "${basepath}${fpath}" "${destroot}${fpath}"
- }
- }
- }
- }
- default { ui_debug "serious error" }
- }
- }
- }
</del><ins>+ # Do not set --host.
+ array set merger_host {
+ ppc ""
+ i386 ""
+ ppc64 ""
+ x86_64 ""
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>