svn commit: r1092859 - in /trafficserver/traffic/trunk: configure.ac cop/TrafficCop.cc lib/ts/ink_string.cc proxy/CoreUtils.cc

[zw...@apache.org]

Author: zwoop
Date: Sat Apr 16 03:14:55 2011
New Revision: 1092859

URL: http://svn.apache.org/viewvc?rev=1092859&view=rev
Log:
TS-740 Traffic Server fails to build on kfreebsd

Author: Arno Toell
Review: Leif

Modified:
    trafficserver/traffic/trunk/configure.ac
    trafficserver/traffic/trunk/cop/TrafficCop.cc
    trafficserver/traffic/trunk/lib/ts/ink_string.cc
    trafficserver/traffic/trunk/proxy/CoreUtils.cc

Modified: trafficserver/traffic/trunk/configure.ac
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/configure.ac?rev=1092859&r1=1092858&r2=1092859&view=diff
==============================================================================
--- trafficserver/traffic/trunk/configure.ac (original)
+++ trafficserver/traffic/trunk/configure.ac Sat Apr 16 03:14:55 2011
@@ -515,7 +515,7 @@ case $host_os in
     TS_ADDTO(CPPFLAGS, [-I/opt/local/include])
     TS_ADDTO(LDFLAGS, [-L/opt/local/lib])
     ;;
-  freebsd*)
+  freebsd*|kfreebsd*)
     common_opt="-pipe -Wall -Werror"
     debug_opt="-ggdb3 $common_opt"
     release_opt="-g $common_opt -O3 -feliminate-unused-debug-symbols -fno-strict-aliasing"
@@ -660,6 +660,11 @@ case $host_os in
     EXTRA_CXX_LDFLAGS="-rdynamic"
     host_os_def=freebsd
     ;;
+  kfreebsd*)
+    EXTRA_CXX_LDFLAGS="-rdynamic"
+    host_os_def=freebsd
+    TS_ADDTO(CPPFLAGS, [-Dkfreebsd])
+    ;;
   solaris*)
     host_os_def=solaris
     ;;
@@ -670,6 +675,8 @@ case $host_os in
 esac
 TS_ADDTO(CPPFLAGS, [-D$host_os_def])
 
+AC_MSG_NOTICE([Build for host OS: $host_os, arch: $host_cpu, optimization: $host_os_def])
+
 #
 # _Here_ is where we go ahead and add the _optimizations_ to already
 #  existing CFLAGS/CXXFLAGS if some special values had been set.
@@ -748,7 +755,7 @@ esac
 AC_SUBST([LIBTCL],[$TCL_LIB_SPEC])
 
 case $host_os in
-  freebsd*)
+  freebsd*|kfreebsd*)
     TS_ADDTO(CPPFLAGS, [-I/usr/local/include])
     ;;
   solaris*)

Modified: trafficserver/traffic/trunk/cop/TrafficCop.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/cop/TrafficCop.cc?rev=1092859&r1=1092858&r2=1092859&view=diff
==============================================================================
--- trafficserver/traffic/trunk/cop/TrafficCop.cc (original)
+++ trafficserver/traffic/trunk/cop/TrafficCop.cc Sat Apr 16 03:14:55 2011
@@ -728,7 +728,7 @@ spawn_manager()
     if (err < 0) {
       break;
     }
-#if !defined(linux) && !defined(freebsd) && !defined(darwin)
+#if defined(solaris) || defined(kfreebsd) || defined(unknown)
     err = semctl(err, 1, IPC_RMID);
 #else
     union semun dummy_semun;
@@ -1938,7 +1938,7 @@ main(int argc, char *argv[])
   signal(SIGTTIN, SIG_IGN);
 
   setsid();                     // Important, thanks Vlad. :)
-#if defined(freebsd)
+#if defined(freebsd) && !defined(kfreebsd)
   setpgrp(0,0);
 #else
   setpgrp();

Modified: trafficserver/traffic/trunk/lib/ts/ink_string.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/lib/ts/ink_string.cc?rev=1092859&r1=1092858&r2=1092859&view=diff
==============================================================================
--- trafficserver/traffic/trunk/lib/ts/ink_string.cc (original)
+++ trafficserver/traffic/trunk/lib/ts/ink_string.cc Sat Apr 16 03:14:55 2011
@@ -500,7 +500,7 @@ ink_utf8_to_latin1(const char *in, int i
 
   inbytesleft = inlen;
   outbytesleft = *outlen;
-#if defined(freebsd) || defined(solaris)
+#if !defined(kfreebsd) && (defined(freebsd) || defined(solaris))
   if (iconv(ic, &in, &inbytesleft, &out, &outbytesleft) == (size_t) - 1)
 #else
   if (iconv(ic, (char **) &in, &inbytesleft, &out, &outbytesleft) == (size_t) - 1)

Modified: trafficserver/traffic/trunk/proxy/CoreUtils.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/CoreUtils.cc?rev=1092859&r1=1092858&r2=1092859&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/CoreUtils.cc (original)
+++ trafficserver/traffic/trunk/proxy/CoreUtils.cc Sat Apr 16 03:14:55 2011
@@ -979,7 +979,7 @@ CoreUtils::process_EThread(EThread * eth
 
     // This is not 64-bit correct. /leif
     printf("----------- EThread @ 0x%p ----------\n", eth_test);
-#if defined(freebsd) || defined(darwin)
+#if !defined(kfreebsd) && (defined(freebsd) || defined(darwin))
     printf("   thread_id: %p\n", loaded_eth->tid);
 #else
     printf("   thread_id: %i\n", (int) loaded_eth->tid);