<!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>[Freeswitch-trunk][17071] </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">
<div id="header">FreeSWITCH Subversion</div>
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://fisheye.freeswitch.org/changelog/FreeSWITCH?cs=17071">17071</a></dd>
<dt>Author</dt> <dd>mikej</dd>
<dt>Date</dt> <dd>2010-03-22 18:05:20 -0500 (Mon, 22 Mar 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>fix openbsd build (<a href="http://jira.freeswitch.org/browse/FSBUILD-256">FSBUILD-256</a>)</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunkbootstrapsh">freeswitch/trunk/bootstrap.sh</a></li>
<li><a href="#freeswitchtrunkconfigurein">freeswitch/trunk/configure.in</a></li>
<li><a href="#freeswitchtrunklibssqlitesrcsqliteInth">freeswitch/trunk/libs/sqlite/src/sqliteInt.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunkbootstrapsh"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/bootstrap.sh (17070 => 17071)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/bootstrap.sh 2010-03-22 23:02:48 UTC (rev 17070)
+++ freeswitch/trunk/bootstrap.sh 2010-03-22 23:05:20 UTC (rev 17071)
</span><span class="lines">@@ -25,6 +25,12 @@
</span><span class="cx"> echo " to build FreeSWITCH from SVN."
</span><span class="cx"> exit 1
</span><span class="cx"> fi
</span><ins>+
+if test `uname -s` = "OpenBSD" && test "$ac_version" = "2.62"; then
+echo "Autoconf 2.62 is broken on OpenBSD, please try another version"
+exit 1
+fi
+
</ins><span class="cx"> IFS=_; set $ac_version; IFS=' '
</span><span class="cx"> ac_version=$1
</span><span class="cx"> IFS=.; set $ac_version; IFS=' '
</span><span class="lines">@@ -37,6 +43,7 @@
</span><span class="cx"> echo "bootstrap: autoconf version $ac_version (ok)"
</span><span class="cx"> fi
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> # automake 1.7 or newer
</span><span class="cx">
</span><span class="cx"> am_version=`${AUTOMAKE:-automake} --version 2>/dev/null|sed -e 's/^[^0-9]*//;s/[a-z]* *$//;s/[- ].*//g;q'`
</span></span></pre></div>
<a id="freeswitchtrunkconfigurein"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/configure.in (17070 => 17071)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/configure.in 2010-03-22 23:02:48 UTC (rev 17070)
+++ freeswitch/trunk/configure.in 2010-03-22 23:05:20 UTC (rev 17071)
</span><span class="lines">@@ -589,7 +589,7 @@
</span><span class="cx"> int64_value="long"
</span><span class="cx"> long_value=long
</span><span class="cx"> case "$host" in
</span><del>- *-solaris2*|*apple-darwin*)
</del><ins>+ *-solaris2*|*apple-darwin*|*-openbsd*)
</ins><span class="cx"> if test "$ac_cv_sizeof_long_long" = "8"; then
</span><span class="cx"> int64_t_fmt='#define SWITCH_INT64_T_FMT "lld"'
</span><span class="cx"> uint64_t_fmt='#define SWITCH_UINT64_T_FMT "llu"'
</span><span class="lines">@@ -696,7 +696,16 @@
</span><span class="cx"> AC_SUBST(ssize_t_fmt)
</span><span class="cx"> AC_SUBST(size_t_fmt)
</span><span class="cx">
</span><del>-AC_PATH_PROGS(ZCAT, gunzip gzcat gzip zcat)
</del><ins>+case $host in
+ *-openbsd*)
+ # OpenBSD's gunzip and friends don't like -d because its redundant, only gzip does
+ AC_PATH_PROGS(ZCAT, gzip)
+ ;;
+ *)
+ AC_PATH_PROGS(ZCAT, gunzip gzcat gzip zcat)
+ ;;
+esac
+
</ins><span class="cx"> AC_PATH_PROGS(TAR, gtar tar)
</span><span class="cx"> AC_PATH_PROGS(WGET, wget)
</span><span class="cx"> AC_PATH_PROGS(CURL, curl)
</span><span class="lines">@@ -951,6 +960,14 @@
</span><span class="cx"> AC_CONFIG_SUBDIRS([libs/broadvoice])
</span><span class="cx"> AC_CONFIG_SUBDIRS([libs/libg722_1])
</span><span class="cx">
</span><ins>+case $host in
+ *-openbsd*)
+ # libtool won't link static libs against shared ones on OpenBSD unless we tell it not to be stupid
+ AC_CONFIG_COMMANDS([hacklibtool], [cp libtool libtool.orig && sed -e "s/deplibs_check_method=.*/deplibs_check_method=pass_all/g" libtool.orig > libtool])
+ ;;
+esac
+
+
</ins><span class="cx"> AC_OUTPUT
</span><span class="cx">
</span><span class="cx"> ##
</span></span></pre></div>
<a id="freeswitchtrunklibssqlitesrcsqliteInth"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/sqlite/src/sqliteInt.h (17070 => 17071)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/sqlite/src/sqliteInt.h 2010-03-22 23:02:48 UTC (rev 17070)
+++ freeswitch/trunk/libs/sqlite/src/sqliteInt.h 2010-03-22 23:05:20 UTC (rev 17071)
</span><span class="lines">@@ -61,6 +61,9 @@
</span><span class="cx"> #include "hash.h"
</span><span class="cx"> #include "parse.h"
</span><span class="cx"> #include <stdio.h>
</span><ins>+#ifdef __OpenBSD__
+#include <stdint.h>
+#endif
</ins><span class="cx"> #include <stdlib.h>
</span><span class="cx"> #include <string.h>
</span><span class="cx"> #include <assert.h>
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>