Author: Francesco Chemolli <kinkie@squid-cache.org>

Fixed OpenSolaris build issues.

diff --git a/configure.in b/configure.in
index 9aa18580413211e9df37fcd9d30050b58f6240a9..ab7a82a4f06ac03c08d2720d0b6009c0a1112076 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -2541,6 +2541,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..e9ae0c707ea4c08bd850b8a083ed1b6a9dac6698 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 the CPU
+}
 #undef USE_XPROF_STATS
 #endif
 

diff --git a/src/Makefile.am b/src/Makefile.am
index 3fbfe7e1448d74e8b4dbce6202612e4b3e26fc40..2b83a0ee685486c2051a40db6dfeb579dfd9e062 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -165,10 +165,11 @@ 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
+INCLUDES += -I$(top_srcdir)/lib -I$(top_srcdir)/lib/libLtdl
 
 EXTRA_PROGRAMS = \
        DiskIO/DiskDaemon/diskd \
@@ -533,7 +534,6 @@ squid_LDADD = \
        $(ESI_LIBS) \
        @SSLLIB@ \
        -lmiscutil \
-       @XTRA_LIBS@ \
        @EPOLL_LIBS@ \
        @MINGW_LIBS@ 
 squid_DEPENDENCIES = $(top_builddir)/lib/libmiscutil.a \
@@ -619,7 +619,6 @@ ufsdump_LDADD = \
        @SNMPLIB@ \
        @SSLLIB@ \
        -L$(top_builddir)/lib -lmiscutil \
-       @XTRA_LIBS@ \
        @EPOLL_LIBS@ \
        @MINGW_LIBS@ 
 ufsdump_DEPENDENCIES = $(top_builddir)/lib/libmiscutil.a \
@@ -916,6 +915,7 @@ tests_testHttpReply_LDADD=\
        acl/libstate.la \
        auth/libauth.la \
        ip/libip.la \
+       @XTRA_LIBS@ \
        @SQUID_CPPUNIT_LIBS@ \
        @SQUID_CPPUNIT_LA@ \
        -L../lib -lmiscutil
@@ -1180,8 +1180,7 @@ tests_testCacheManager_LDADD = \
        -L../lib -lmiscutil \
        @SQUID_CPPUNIT_LIBS@ \
        @SQUID_CPPUNIT_LA@ \
-       @SSLLIB@ \
-       @XTRA_LIBS@
+       @SSLLIB@
 tests_testCacheManager_LDFLAGS = $(LIBADD_DL)
 tests_testCacheManager_DEPENDENCIES =  $(top_builddir)/lib/libmiscutil.a \
        @REPL_OBJS@ \
@@ -1351,8 +1350,7 @@ tests_testEvent_LDADD = \
        -L../lib -lmiscutil \
        @SQUID_CPPUNIT_LIBS@ \
        @SQUID_CPPUNIT_LA@ \
-       @SSLLIB@ \
-       @XTRA_LIBS@
+       @SSLLIB@
 tests_testEvent_LDFLAGS = $(LIBADD_DL)
 tests_testEvent_DEPENDENCIES =  $(top_builddir)/lib/libmiscutil.a \
        @REPL_OBJS@ \
@@ -1499,8 +1497,7 @@ tests_testEventLoop_LDADD = \
        -L../lib -lmiscutil \
        @SQUID_CPPUNIT_LIBS@ \
        @SQUID_CPPUNIT_LA@ \
-       @SSLLIB@ \
-       @XTRA_LIBS@
+       @SSLLIB@
 tests_testEventLoop_LDFLAGS = $(LIBADD_DL)
 tests_testEventLoop_DEPENDENCIES =  $(top_builddir)/lib/libmiscutil.a \
        @REPL_OBJS@ \
@@ -1642,8 +1639,7 @@ tests_test_http_range_LDADD = \
        -L../lib -lmiscutil \
        @SQUID_CPPUNIT_LIBS@ \
        @SQUID_CPPUNIT_LA@ \
-       @SSLLIB@ \
-       @XTRA_LIBS@
+       @SSLLIB@
 tests_test_http_range_LDFLAGS = $(LIBADD_DL)
 tests_test_http_range_DEPENDENCIES = \
        @SQUID_CPPUNIT_LA@
@@ -1790,8 +1786,7 @@ tests_testHttpRequest_LDADD = \
        -L../lib -lmiscutil \
        @SQUID_CPPUNIT_LIBS@ \
        @SQUID_CPPUNIT_LA@ \
-       @SSLLIB@ \
-       @XTRA_LIBS@
+       @SSLLIB@
 tests_testHttpRequest_LDFLAGS = $(LIBADD_DL)
 tests_testHttpRequest_DEPENDENCIES =  $(top_builddir)/lib/libmiscutil.a \
        @REPL_OBJS@ \
@@ -2141,8 +2136,7 @@ tests_testURL_LDADD = \
        -L../lib -lmiscutil \
        @SQUID_CPPUNIT_LIBS@ \
        @SQUID_CPPUNIT_LA@ \
-       @SSLLIB@ \
-       @XTRA_LIBS@
+       @SSLLIB@
 tests_testURL_LDFLAGS = $(LIBADD_DL)
 tests_testURL_DEPENDENCIES =  $(top_builddir)/lib/libmiscutil.a \
        @REPL_OBJS@ \

diff --git a/src/icmp/Makefile.am b/src/icmp/Makefile.am
index 73c8c232a0c052c18da9f384ae6bb242fdc2f78f..9d9a2f02681eb6fa831744a880fa933543dada9a 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 \
@@ -101,6 +102,7 @@ testIcmp_LDFLAGS = $(LIBADD_DL)
 testIcmp_LDADD=\
        @SQUID_CPPUNIT_LIBS@ \
        @SQUID_CPPUNIT_LA@ \
+       @XTRA_LIBS@ \
        libicmp-core.la \
        ../ip/libip.la \
        $(top_builddir)/lib/libmiscutil.a

diff --git a/src/ip/Makefile.am b/src/ip/Makefile.am
index dfbebd163497079d9d0c1b4ca4fbb7f4ea5e9ac5..ee83d8df1d6a7ba07c4716b8cc09506306d94b8f 100644 (file)
--- a/src/ip/Makefile.am
+++ b/src/ip/Makefile.am
@@ -24,6 +24,7 @@ testIpAddress_LDADD= \
        $(top_builddir)/compat/libcompat.la \
        libip.la \
        -L$(top_builddir)/lib -lmiscutil \
+       @XTRA_LIBS@ \
        @SQUID_CPPUNIT_LA@ \
        @SQUID_CPPUNIT_LIBS@
 testIpAddress_LDFLAGS= $(LIBADD_DL)

diff --git a/src/tools.cc b/src/tools.cc
index 53fc272774dc32b7646e791a0908d1fa952f0a1e..f419f2f0b2441464062292d4c4f194d916b42f3d 100644 (file)
--- a/src/tools.cc
+++ b/src/tools.cc
@@ -69,6 +69,13 @@ 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 +342,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 +351,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]);