<!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>[114732] users/landonf/openjdk7/dports/java/openjdk6/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="https://trac.macports.org/changeset/114732">114732</a></dd>
<dt>Author</dt> <dd>landonf@macports.org</dd>
<dt>Date</dt> <dd>2013-12-14 06:44:03 -0800 (Sat, 14 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Update the supported arch list, set the license, and remove now-unnecessary arch detection.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#userslandonfopenjdk7dportsjavaopenjdk6Portfile">users/landonf/openjdk7/dports/java/openjdk6/Portfile</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="userslandonfopenjdk7dportsjavaopenjdk6Portfile"></a>
<div class="modfile"><h4>Modified: users/landonf/openjdk7/dports/java/openjdk6/Portfile (114731 => 114732)</h4>
<pre class="diff"><span>
<span class="info">--- users/landonf/openjdk7/dports/java/openjdk6/Portfile 2013-12-14 14:40:13 UTC (rev 114731)
+++ users/landonf/openjdk7/dports/java/openjdk6/Portfile 2013-12-14 14:44:03 UTC (rev 114732)
</span><span class="lines">@@ -25,6 +25,14 @@
</span><span class="cx"> Classpath exception. The Java Hotspot virtual machine source code is \
</span><span class="cx"> licensed under the GPL version 2 only.
</span><span class="cx">
</span><ins>+supported_archs x86_64
+
+# Licensed GPLv2-CPE. See also:
+# - http://openjdk.java.net/legal/gplv2+ce.html
+# - http://en.wikipedia.org/wiki/GPL_linking_exception#The_classpath_exception
+license Permissive
+
+
</ins><span class="cx"> # Use our own version of ant to avoid circular dependencies
</span><span class="cx"> set ant_version 1.8.4
</span><span class="cx"> set ant_distfile apache-ant-${ant_version}-bin
</span><span class="lines">@@ -52,13 +60,20 @@
</span><span class="cx"> port:dejavu-fonts
</span><span class="cx">
</span><span class="cx"> # Check if the bootstrap is required
</span><del>-if {[file exists ${prefix}/share/java/openjdk6/bin/java]} {
- # A previous OpenJDK6 release is already installed
- set bootstrapvm "${prefix}/share/java/openjdk6"
</del><ins>+if {[file exists ${prefix}/share/java/openjdk7/bin/java]} {
+ # A previous OpenJDK7 release is already installed
+ set bootflags {}
+ set bootstrapvm "${prefix}/share/java/openjdk7"
</ins><span class="cx"> } else {
</span><span class="cx"> # A bootstrap binary is required to build
</span><del>- depends_build-append port:openjdk6_bootstrap
- set bootstrapvm "${prefix}/share/java/openjdk6_bootstrap"
</del><ins>+ #depends_build-append port:bootstrap_openjdk
+ #set bootstrapvm "${prefix}/share/java/bootstrap_openjdk"
+
+ # TODO: We need to provide a bootstrap once we have this port building successfully,
+ # but for now, rely on Apple's JDK6
+ set bootflags SA_APPLE_BOOT_JAVA=true \
+ ALWAYS_PASS_TEST_GAMMA=true
+ set bootstrapvm [exec /usr/libexec/java_home -v 1.6]
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> worksrcdir "openjdk"
</span><span class="lines">@@ -73,35 +88,6 @@
</span><span class="cx"> build.pre_args {}
</span><span class="cx"> build.post_args {}
</span><span class="cx">
</span><del>-# Determine the OpenJDK architecture
-#
-# XXX:
-# The OpenJDK build scripts currently rely on uname -m, which may return i386 or x86_64
-# regardless of the actual supported architecture. I'll be fixing this upstream (using ARCH_DATA_MODEL to
-# let the user select between amd64/i586 on any x86 target), but in the meantime, we use UNAME_MACHINE
-# to override what uname -m returns.
-supported_archs i386 x86_64 ppc
-if {${build_arch} == "i386"} {
- build.env-append "UNAME_MACHINE=i386"
- set openjdk_datamodel "32"
- set openjdk_build_arch "i586"
-
-} elseif {${build_arch} == "x86_64"} {
- build.env-append "UNAME_MACHINE=amd64"
- set openjdk_datamodel "64"
- set openjdk_build_arch "amd64"
-
-} elseif {${build_arch} == "ppc"} {
- # Currently unsupported
- build.env-append "UNAME_MACHINE=ppc"
- set openjdk_datamodel "32"
- set openjdk_build_arch "ppc"
-} else {
- # Unknown architecture
- set openjdk_datamodel "32"
- set openjdk_build_arch "unsupported"
-}
-
</del><span class="cx"> build.args \
</span><span class="cx"> ARCH_DATA_MODEL="${openjdk_datamodel}" \
</span><span class="cx"> ALT_BOOTDIR="${bootstrapvm}" \
</span></span></pre>
</div>
</div>
</body>
</html>