Fixed OpenSolaris build issues.

diff --git a/configure.in b/configure.in
index 07200f8e43765c176c78286afeb7f4daa0acf5ca..4ccc573124b6481d2956489da0365bda2916cab8 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -2806,6 +2806,7 @@ AC_CHECK_TYPE(mtyp_t,AC_DEFINE(HAVE_MTYP_T,1,[mtyp_t is defined by the system he
 dnl Check for needed libraries
 AC_CHECK_LIB(nsl, main)
 AC_CHECK_LIB(socket, main)
+AC_CHECK_LIB(opcom_stack,main)
 dnl Check for Winsock only on MinGW, on Cygwin we must use emulated BSD socket API
 case "$host_os" in
   mingw|mingw32)

diff --git a/include/profiling.h b/include/profiling.h
index 49768f0bf975dcdc1d2d57a43dbe25b682bd1e6a..8e15bc58e8d428f01086d63305427f12a7a3c652 100644 (file)
--- a/include/profiling.h
+++ b/include/profiling.h
@@ -67,7 +67,11 @@ get_tick(void)
 }
 
 #else
-#warning Unsupported CPU. Define function get_tick(). Disabling USE_XPROF_STATS...
+static inline hrtime_t
+get_tick(void)
+{
+    return 0; // unsupported on this CPU
+}
 #undef USE_XPROF_STATS
 #endif
 

diff --git a/src/Makefile.am b/src/Makefile.am
index e344ca0a0a733549a0c65417f7dc186cd3f33b03..a84a943eab8878969b3d0f7583ce0b012d546457 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -166,7 +166,8 @@ COMMON_LIBS = \
        auth/libauth.la \
        acl/libapi.la \
        ip/libip.la \
-       fs/libfs.la
+       fs/libfs.la \
+       @XTRA_LIBS@
 
 ## Loadable Modules needs lib/libLtdl stuff
 INCLUDES += -I$(top_srcdir)/lib
@@ -548,7 +549,6 @@ squid_LDADD = \
        $(ESI_LIBS) \
        $(COMPAT_LIB) \
        @SSLLIB@ \
-       @XTRA_LIBS@ \
        @EPOLL_LIBS@ \
        @MINGW_LIBS@ \
        @KRB5LIBS@
@@ -638,7 +638,6 @@ ufsdump_LDADD = \
        @SNMPLIB@ \
        @SSLLIB@ \
        -L$(top_builddir)/lib -lmiscutil \
-       @XTRA_LIBS@ \
        @EPOLL_LIBS@ \
        @MINGW_LIBS@
 ufsdump_DEPENDENCIES = $(top_builddir)/lib/libmiscutil.a \
@@ -658,7 +657,7 @@ sysconf_DATA = \
 data_DATA = \
        mib.txt
 
-LDADD = $(COMMON_LIBS) -L../lib -lmiscutil @XTRA_LIBS@ @EPOLL_LIBS@ @MINGW_LIBS@
+LDADD = $(COMMON_LIBS) -L../lib -lmiscutil @EPOLL_LIBS@ @MINGW_LIBS@
 
 EXTRA_DIST = \
        cf_gen_defines \
@@ -1209,7 +1208,6 @@ tests_testCacheManager_LDADD = \
        @SQUID_CPPUNIT_LIBS@ \
        @SQUID_CPPUNIT_LA@ \
        @SSLLIB@ \
-       @XTRA_LIBS@ \
        @KRB5LIBS@
 tests_testCacheManager_LDFLAGS = $(LIBADD_DL)
 tests_testCacheManager_DEPENDENCIES =  $(top_builddir)/lib/libmiscutil.a \
@@ -1382,7 +1380,6 @@ tests_testEvent_LDADD = \
        @SQUID_CPPUNIT_LIBS@ \
        @SQUID_CPPUNIT_LA@ \
        @SSLLIB@ \
-       @XTRA_LIBS@ \
        @KRB5LIBS@
 tests_testEvent_LDFLAGS = $(LIBADD_DL)
 tests_testEvent_DEPENDENCIES =  $(top_builddir)/lib/libmiscutil.a \
@@ -1531,7 +1528,6 @@ tests_testEventLoop_LDADD = \
        @SQUID_CPPUNIT_LIBS@ \
        @SQUID_CPPUNIT_LA@ \
        @SSLLIB@ \
-       @XTRA_LIBS@ \
        @KRB5LIBS@
 tests_testEventLoop_LDFLAGS = $(LIBADD_DL)
 tests_testEventLoop_DEPENDENCIES =  $(top_builddir)/lib/libmiscutil.a \
@@ -1675,7 +1671,6 @@ tests_test_http_range_LDADD = \
        @SQUID_CPPUNIT_LIBS@ \
        @SQUID_CPPUNIT_LA@ \
        @SSLLIB@ \
-       @XTRA_LIBS@ \
        @KRB5LIBS@
 tests_test_http_range_LDFLAGS = $(LIBADD_DL)
 tests_test_http_range_DEPENDENCIES = \
@@ -1824,7 +1819,6 @@ tests_testHttpRequest_LDADD = \
        @SQUID_CPPUNIT_LIBS@ \
        @SQUID_CPPUNIT_LA@ \
        @SSLLIB@ \
-       @XTRA_LIBS@ \
        @KRB5LIBS@
 tests_testHttpRequest_LDFLAGS = $(LIBADD_DL)
 tests_testHttpRequest_DEPENDENCIES =  $(top_builddir)/lib/libmiscutil.a \
@@ -2174,7 +2168,6 @@ tests_testURL_LDADD = \
        @SQUID_CPPUNIT_LIBS@ \
        @SQUID_CPPUNIT_LA@ \
        @SSLLIB@ \
-       @XTRA_LIBS@ \
        @KRB5LIBS@
 tests_testURL_LDFLAGS = $(LIBADD_DL)
 tests_testURL_DEPENDENCIES =  $(top_builddir)/lib/libmiscutil.a \

diff --git a/src/icmp/Makefile.am b/src/icmp/Makefile.am
index 73c8c232a0c052c18da9f384ae6bb242fdc2f78f..87e40b6f8dece74cc40831d6be05c1eaa0763a5c 100644 (file)
--- a/src/icmp/Makefile.am
+++ b/src/icmp/Makefile.am
@@ -61,6 +61,7 @@ pinger_LDFLAGS = $(LIBADD_DL)
 pinger_LDADD=\
        libicmp-core.la \
        ../ip/libip.la \
+       @XTRA_LIBS@ \
        $(top_builddir)/lib/libmiscutil.a
 pinger_DEPENDENCIES= \
        libicmp-core.la \
@@ -103,6 +104,7 @@ testIcmp_LDADD=\
        @SQUID_CPPUNIT_LA@ \
        libicmp-core.la \
        ../ip/libip.la \
+       @XTRA_LIBS@ \
        $(top_builddir)/lib/libmiscutil.a
 testIcmp_DEPENDENCIES= @SQUID_CPPUNIT_LA@ \
        libicmp-core.la \

diff --git a/src/ip/Makefile.am b/src/ip/Makefile.am
index 38772857dd40aa296bd4d6d937a829fa4956b833..888b57ef4cc2fbb9bc52fd56b1d7bca32ef14505 100644 (file)
--- a/src/ip/Makefile.am
+++ b/src/ip/Makefile.am
@@ -22,6 +22,7 @@ nodist_testIpAddress_SOURCES= \
        ../tests/testMain.cc
 testIpAddress_LDADD= \
        libip.la \
+       @XTRA_LIBS@ \
        $(COMPAT_LIB) \
        @SQUID_CPPUNIT_LA@ \
        @SQUID_CPPUNIT_LIBS@

diff --git a/src/tools.cc b/src/tools.cc
index 236b95073e8c9be304e5269b4f59b881224e8ea1..8cb252a09ce20b0a5eaafc43d06cd566a3aa24a0 100644 (file)
--- a/src/tools.cc
+++ b/src/tools.cc
@@ -69,6 +69,12 @@ static void restoreCapabilities(int keep);
 SQUIDCEXTERN int backtrace(void *, int);
 SQUIDCEXTERN void backtrace_symbols_fd(void *, int, int);
 SQUIDCEXTERN int setresuid(uid_t, uid_t, uid_t);
+#else /* _SQUID_LINUX_ */
+/* needed on Opensolaris for backtrace_symbols_fd */
+#if HAVE_EXECINFO_H
+#include <execinfo.h>
+#endif /* HAVE_EXECINFO_H */
+
 #endif /* _SQUID_LINUX */
 
 SQUIDCEXTERN void (*failure_notify) (const char *);
@@ -335,7 +341,7 @@ death(int sig)
     }
 
 #endif /* _SQUID_HPUX_ */
-#ifdef _SQUID_SOLARIS_
+#if defined(_SQUID_SOLARIS_) && HAVE_LIBOPCOM_STACK
     {                          /* get ftp://opcom.sun.ca/pub/tars/opcom_stack.tar.gz and */
         extern void opcom_stack_trace(void);   /* link with -lopcom_stack */
         fflush(debug_log);
@@ -344,7 +350,7 @@ death(int sig)
         fflush(stdout);
     }
 
-#endif /* _SQUID_SOLARIS_ */
+#endif /* _SQUID_SOLARIS_and HAVE_LIBOPCOM_STACK */
 #if HAVE_BACKTRACE_SYMBOLS_FD
     {
         static void *(callarray[8192]);