[csw-devel] SF.net SVN: gar:[17681] csw/mgar/pkg/powerdns/branches/pdns-3.1-rc2
wilbury at users.sourceforge.net
wilbury at users.sourceforge.net
Sun Apr 15 01:46:11 CEST 2012
Revision: 17681
http://gar.svn.sourceforge.net/gar/?rev=17681&view=rev
Author: wilbury
Date: 2012-04-14 23:46:10 +0000 (Sat, 14 Apr 2012)
Log Message:
-----------
powerdns/branches/pdns-3.1-rc2: More Solaris specific patches.
Modified Paths:
--------------
csw/mgar/pkg/powerdns/branches/pdns-3.1-rc2/Makefile
csw/mgar/pkg/powerdns/branches/pdns-3.1-rc2/checksums
Added Paths:
-----------
csw/mgar/pkg/powerdns/branches/pdns-3.1-rc2/files/0003-Use-opt-csw-bin-gar.patch
csw/mgar/pkg/powerdns/branches/pdns-3.1-rc2/files/0004-Use-gethrtime-on-SPARC.patch
csw/mgar/pkg/powerdns/branches/pdns-3.1-rc2/files/0006-Use-empty-epollmplexer.cc-on-Solaris.patch
Removed Paths:
-------------
csw/mgar/pkg/powerdns/branches/pdns-3.1-rc2/files/0003-Patch-for-Solaris-compilation.patch
csw/mgar/pkg/powerdns/branches/pdns-3.1-rc2/files/0004-Add-llber-to-make-OpenLDAP-happy.patch
Modified: csw/mgar/pkg/powerdns/branches/pdns-3.1-rc2/Makefile
===================================================================
--- csw/mgar/pkg/powerdns/branches/pdns-3.1-rc2/Makefile 2012-04-14 22:58:20 UTC (rev 17680)
+++ csw/mgar/pkg/powerdns/branches/pdns-3.1-rc2/Makefile 2012-04-14 23:46:10 UTC (rev 17681)
@@ -33,10 +33,12 @@
DISTFILES += LICENSE
DISTFILES += cswpdns
+PATCHFILES += 0003-Use-opt-csw-bin-gar.patch
+PATCHFILES += 0004-Use-gethrtime-on-SPARC.patch
+PATCHFILES += 0006-Use-empty-epollmplexer.cc-on-Solaris.patch
+
WORKSRC = $(WORKDIR)/$(NAME)-$(VERSION)
-PATCHFILES = 0003-Patch-for-Solaris-compilation.patch
-
LICENSE = $(FILEDIR)/LICENSE
PACKAGING_PLATFORMS = solaris10-i386 solaris10-sparc
@@ -78,6 +80,12 @@
# Needed for BOOST on SPARC
ARCHFLAGS_GCC4_sparcv8plus = -mcpu=v9
+EXTRA_CFLAGS_sparc = -D__SPARC__
+EXTRA_CFLAGS = $(EXTRA_CFLAGS_$(GARCH))
+
+EXTRA_CXXFLAGS_sparc = -D__SPARC__
+EXTRA_CXXFLAGS = $(EXTRA_CXXFLAGS_$(GARCH))
+
# PowerDNS does not have any "test" target
SKIPTEST = 1
Modified: csw/mgar/pkg/powerdns/branches/pdns-3.1-rc2/checksums
===================================================================
--- csw/mgar/pkg/powerdns/branches/pdns-3.1-rc2/checksums 2012-04-14 22:58:20 UTC (rev 17680)
+++ csw/mgar/pkg/powerdns/branches/pdns-3.1-rc2/checksums 2012-04-14 23:46:10 UTC (rev 17681)
@@ -1 +1 @@
-3e1ac551b4fb9d75be513e9dcfe59115 pdns-3.1-rc1.tar.gz
+9b0eda4c8b202e4f7a907da6e5ee1d2e pdns-3.1-rc2.tar.gz
Deleted: csw/mgar/pkg/powerdns/branches/pdns-3.1-rc2/files/0003-Patch-for-Solaris-compilation.patch
===================================================================
--- csw/mgar/pkg/powerdns/branches/pdns-3.1-rc2/files/0003-Patch-for-Solaris-compilation.patch 2012-04-14 22:58:20 UTC (rev 17680)
+++ csw/mgar/pkg/powerdns/branches/pdns-3.1-rc2/files/0003-Patch-for-Solaris-compilation.patch 2012-04-14 23:46:10 UTC (rev 17681)
@@ -1,160 +0,0 @@
-From 050de1b8fdc43e512e71b1e1c3119f8a07d60f89 Mon Sep 17 00:00:00 2001
-From: Juraj Lutter <wilbury at opencsw.org>
-Date: Thu, 5 Apr 2012 22:45:30 +0200
-Subject: [PATCH] Patch for Solaris compilation.
-
----
- modules/ldapbackend/utils.hh | 2 +-
- pdns/backends/gsql/gsqlbackend.cc | 71 ++++++++++++++
- pdns/dnspcap.hh | 4 +
- pdns/ext/polarssl-1.1.1/library/Makefile | 2 +-
- pdns/ext/polarssl-1.1.1/library/net.c | 2 +
- 5 files changed, 157 insertions(+), 80 deletions(-)
-
-diff --git a/modules/ldapbackend/utils.hh b/modules/ldapbackend/utils.hh
-index ba60f9f..25392c3 100644
---- a/modules/ldapbackend/utils.hh
-+++ b/modules/ldapbackend/utils.hh
-@@ -147,7 +147,7 @@ inline time_t str2tstamp( const string& str )
-
- if( tmp != NULL && *tmp == 0 )
- {
-- return timegm( &tm );
-+ return Utility::timegm( &tm );
- }
-
- return 0;
-diff --git a/pdns/backends/gsql/gsqlbackend.cc b/pdns/backends/gsql/gsqlbackend.cc
-index 2bd8ffc..aede8e6 100644
---- a/pdns/backends/gsql/gsqlbackend.cc
-+++ b/pdns/backends/gsql/gsqlbackend.cc
-@@ -21,6 +21,7 @@
- # pragma warning ( disable: 4786 )
- #endif // WIN32
-
-+#include <sys/varargs.h>
- #include <string>
- #include <map>
-
-@@ -760,6 +761,76 @@ bool GSQLBackend::get(DNSResourceRecord &r)
- return false;
- }
-
-+#if (defined (__SVR4) && defined (__sun))
-+
-+extern "C" {
-+#define INIT_SZ 128
-+
-+/* VARARGS2 */
-+int
-+vasprintf(char **str, const char *format, va_list ap)
-+{
-+ char string[INIT_SZ];
-+ char *newstr;
-+ int ret;
-+ size_t len;
-+
-+ *str = NULL;
-+ ret = vsnprintf(string, INIT_SZ, format, ap);
-+ if (ret < 0) /* retain the value of errno from vsnprintf() */
-+ return (-1);
-+ if (ret < INIT_SZ) {
-+ len = ret + 1;
-+ if ((newstr = (char*) malloc(len)) == NULL)
-+ return (-1); /* retain errno from malloc() */
-+ (void) strlcpy(newstr, string, len);
-+ *str = newstr;
-+ return (ret);
-+ }
-+ /*
-+ * We will perform this loop more than once only if some other
-+ * thread modifies one of the vasprintf() arguments after our
-+ * previous call to vsnprintf().
-+ */
-+ for (;;) {
-+ if (ret == INT_MAX) { /* Bad length */
-+ errno = ENOMEM;
-+ return (-1);
-+ }
-+ len = ret + 1;
-+ if ((newstr = (char*) malloc(len)) == NULL)
-+ return (-1); /* retain errno from malloc() */
-+ ret = vsnprintf(newstr, len, format, ap);
-+ if (ret < 0) { /* retain errno from vsnprintf() */
-+ free(newstr);
-+ return (-1);
-+ }
-+ if (ret < len) {
-+ *str = newstr;
-+ return (ret);
-+ }
-+ free(newstr);
-+ }
-+}
-+
-+int
-+asprintf(char **str, const char *format, ...)
-+{
-+ va_list ap;
-+ int ret;
-+
-+ *str = NULL;
-+ va_start(ap, format);
-+ ret = vasprintf(str, format, ap);
-+ va_end(ap);
-+
-+ return (ret);
-+}
-+
-+} /* extern "C" */
-+
-+#endif
-+
- bool GSQLBackend::feedRecord(const DNSResourceRecord &r)
- {
- char *output;
-diff --git a/pdns/dnspcap.hh b/pdns/dnspcap.hh
-index 66e07b9..607a397 100644
---- a/pdns/dnspcap.hh
-+++ b/pdns/dnspcap.hh
-@@ -10,7 +10,11 @@
- #include <netinet/in_systm.h>
- #include <netinet/ip.h>
- #include <netinet/udp.h>
-+#if defined (__sun)
-+#include <sys/ethernet.h>
-+#else
- #include <net/ethernet.h>
-+#endif
- #include <vector>
- #include <boost/format.hpp>
- #include "namespaces.hh"
-diff --git a/pdns/ext/polarssl-1.1.1/library/Makefile b/pdns/ext/polarssl-1.1.1/library/Makefile
-index 26de4d7..624994c 100644
---- a/pdns/ext/polarssl-1.1.1/library/Makefile
-+++ b/pdns/ext/polarssl-1.1.1/library/Makefile
-@@ -49,7 +49,7 @@ libpolarssl.a: $(OBJS)
- echo " AR $@"
- $(AR) r $@ $(OBJS)
- echo " RL $@"
-- $(AR) s $@
-+ ranlib $@
-
- libpolarssl.so: libpolarssl.a
- echo " LD $@"
-diff --git a/pdns/ext/polarssl-1.1.1/library/net.c b/pdns/ext/polarssl-1.1.1/library/net.c
-index 9724c07..e30aebb 100644
---- a/pdns/ext/polarssl-1.1.1/library/net.c
-+++ b/pdns/ext/polarssl-1.1.1/library/net.c
-@@ -63,6 +63,8 @@ static int wsa_init_done = 0;
- #include <sys/endian.h>
- #elif defined(__APPLE__)
- #include <machine/endian.h>
-+#elif defined(sun)
-+#include <sys/isa_defs.h>
- #else
- #include <endian.h>
- #endif
---
-1.7.9
-
Added: csw/mgar/pkg/powerdns/branches/pdns-3.1-rc2/files/0003-Use-opt-csw-bin-gar.patch
===================================================================
--- csw/mgar/pkg/powerdns/branches/pdns-3.1-rc2/files/0003-Use-opt-csw-bin-gar.patch (rev 0)
+++ csw/mgar/pkg/powerdns/branches/pdns-3.1-rc2/files/0003-Use-opt-csw-bin-gar.patch 2012-04-14 23:46:10 UTC (rev 17681)
@@ -0,0 +1,24 @@
+From ac3e2204b79ffe6060559f385e3e76bee1fe7318 Mon Sep 17 00:00:00 2001
+From: Juraj Lutter <wilbury at opencsw.org>
+Date: Sat, 14 Apr 2012 16:20:02 +0200
+Subject: [PATCH] Use /opt/csw/bin/gar
+
+---
+ pdns/ext/polarssl-1.1.1/library/Makefile | 3 +
+ 1 file changed, 3 insertion(+), 0 deletions(-)
+
+--- a/pdns/ext/polarssl-1.1.1/library/Makefile
++++ b/pdns/ext/polarssl-1.1.1/library/Makefile
+@@ -13,6 +13,9 @@ OFLAGS = -O
+ # To compile as a shared library:
+ # CFLAGS += -fPIC
+
++# OpenCSW ``ar''
++AR=/opt/csw/bin/gar
++
+ SONAME=libpolarssl.so.0
+
+ DLEXT=so
+--
+1.7.9
+
Deleted: csw/mgar/pkg/powerdns/branches/pdns-3.1-rc2/files/0004-Add-llber-to-make-OpenLDAP-happy.patch
===================================================================
--- csw/mgar/pkg/powerdns/branches/pdns-3.1-rc2/files/0004-Add-llber-to-make-OpenLDAP-happy.patch 2012-04-14 22:58:20 UTC (rev 17680)
+++ csw/mgar/pkg/powerdns/branches/pdns-3.1-rc2/files/0004-Add-llber-to-make-OpenLDAP-happy.patch 2012-04-14 23:46:10 UTC (rev 17681)
@@ -1,20 +0,0 @@
-From be1063f6b42879daeab42f956fc9e59f2bdda6c5 Mon Sep 17 00:00:00 2001
-From: Juraj Lutter <wilbury at opencsw.org>
-Date: Thu, 5 Apr 2012 23:15:17 +0200
-Subject: [PATCH] Add -llber to make OpenLDAP happy.
-
----
- modules/ldapbackend/OBJECTLIBS | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/modules/ldapbackend/OBJECTLIBS b/modules/ldapbackend/OBJECTLIBS
-index a787b8d..4adc2f0 100644
---- a/modules/ldapbackend/OBJECTLIBS
-+++ b/modules/ldapbackend/OBJECTLIBS
-@@ -1 +1 @@
---lldap_r
-\ No newline at end of file
-+-lldap_r -llber
---
-1.7.9
-
Added: csw/mgar/pkg/powerdns/branches/pdns-3.1-rc2/files/0004-Use-gethrtime-on-SPARC.patch
===================================================================
--- csw/mgar/pkg/powerdns/branches/pdns-3.1-rc2/files/0004-Use-gethrtime-on-SPARC.patch (rev 0)
+++ csw/mgar/pkg/powerdns/branches/pdns-3.1-rc2/files/0004-Use-gethrtime-on-SPARC.patch 2012-04-14 23:46:10 UTC (rev 17681)
@@ -0,0 +1,46 @@
+From d2a6a26e669ba42229fbc735224635cf38b4face Mon Sep 17 00:00:00 2001
+From: Juraj Lutter <wilbury at opencsw.org>
+Date: Sun, 15 Apr 2012 01:18:42 +0200
+Subject: [PATCH] Use gethrtime() on SPARC.
+
+---
+ pdns/htimer.cc | 11 ++++++++++-
+ 1 file changed, 10 insertions(+), 1 deletion(-)
+
+diff --git a/pdns/htimer.cc b/pdns/htimer.cc
+index b2881c2..e94a20a 100644
+--- a/pdns/htimer.cc
++++ b/pdns/htimer.cc
+@@ -2,6 +2,10 @@
+ #include "htimer.hh"
+ #include <iostream>
+
++#ifdef __SPARC__
++#include <sys/time.h>
++#endif // __SPARC__
++
+ HTimer::timers_t HTimer::s_timers;
+
+ #include "namespaces.hh"
+@@ -35,12 +39,17 @@ HTimer::timers_t HTimer::s_timers;
+ Waiting for packets
+ */
+
++#ifdef __SPARC__
++#define RDTSC(qp) \
++ qp = (unsigned long long) gethrtime();
++#else
+ #define RDTSC(qp) \
+ do { \
+- unsigned long lowPart, highPart; \
++ unsigned long lowPart, highPart; \
+ __asm__ __volatile__("rdtsc" : "=a" (lowPart), "=d" (highPart)); \
+ qp = (((unsigned long long) highPart) << 32) | lowPart; \
+ } while (0)
++#endif
+
+ HTimer::HTimer(const std::string& name) : d_accumulated(0), d_started(0)
+ {
+--
+1.7.10
+
Added: csw/mgar/pkg/powerdns/branches/pdns-3.1-rc2/files/0006-Use-empty-epollmplexer.cc-on-Solaris.patch
===================================================================
--- csw/mgar/pkg/powerdns/branches/pdns-3.1-rc2/files/0006-Use-empty-epollmplexer.cc-on-Solaris.patch (rev 0)
+++ csw/mgar/pkg/powerdns/branches/pdns-3.1-rc2/files/0006-Use-empty-epollmplexer.cc-on-Solaris.patch 2012-04-14 23:46:10 UTC (rev 17681)
@@ -0,0 +1,275 @@
+From 2fe74639eeb571a36a28cb71e7a895fd5bfd9790 Mon Sep 17 00:00:00 2001
+From: Juraj Lutter <wilbury at opencsw.org>
+Date: Sun, 15 Apr 2012 01:40:09 +0200
+Subject: [PATCH 6/6] Use empty epollmplexer.cc on Solaris
+
+---
+ codedocs/Makefile | 156 +++++++++++++++++++++++++-------------------------
+ pdns/epollmplexer.cc | 3 +-
+ 2 files changed, 80 insertions(+), 79 deletions(-)
+
+diff --git a/codedocs/Makefile b/codedocs/Makefile
+index 76f458b..8606fcc 100644
+--- a/codedocs/Makefile
++++ b/codedocs/Makefile
+@@ -31,8 +31,8 @@ POST_INSTALL = :
+ NORMAL_UNINSTALL = :
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+-build_triplet = x86_64-unknown-linux-gnu
+-host_triplet = x86_64-unknown-linux-gnu
++build_triplet = sparc-sun-solaris2.10
++host_triplet = sparc-sun-solaris2.10
+ subdir = codedocs
+ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+@@ -47,51 +47,51 @@ CONFIG_CLEAN_VPATH_FILES =
+ SOURCES =
+ DIST_SOURCES =
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+-ACLOCAL = ${SHELL} /home/ahu/auto-build/pdns/missing --run aclocal-1.11
+-AMTAR = ${SHELL} /home/ahu/auto-build/pdns/missing --run tar
++ACLOCAL = ${SHELL} /home/wilbury/b/powerdns/branches/pdns-3.1-rc2/work/solaris10-sparc/build-isa-sparcv8plus/pdns-3.1-rc2/missing --run aclocal-1.11
++AMTAR = ${SHELL} /home/wilbury/b/powerdns/branches/pdns-3.1-rc2/work/solaris10-sparc/build-isa-sparcv8plus/pdns-3.1-rc2/missing --run tar
+ AR = ar
+-AUTOCONF = ${SHELL} /home/ahu/auto-build/pdns/missing --run autoconf
+-AUTOHEADER = ${SHELL} /home/ahu/auto-build/pdns/missing --run autoheader
+-AUTOMAKE = ${SHELL} /home/ahu/auto-build/pdns/missing --run automake-1.11
++AUTOCONF = ${SHELL} /home/wilbury/b/powerdns/branches/pdns-3.1-rc2/work/solaris10-sparc/build-isa-sparcv8plus/pdns-3.1-rc2/missing --run autoconf
++AUTOHEADER = ${SHELL} /home/wilbury/b/powerdns/branches/pdns-3.1-rc2/work/solaris10-sparc/build-isa-sparcv8plus/pdns-3.1-rc2/missing --run autoheader
++AUTOMAKE = ${SHELL} /home/wilbury/b/powerdns/branches/pdns-3.1-rc2/work/solaris10-sparc/build-isa-sparcv8plus/pdns-3.1-rc2/missing --run automake-1.11
+ AWK = gawk
+-BOOST_CPPFLAGS =
+-BOOST_PROGRAM_OPTIONS_LDFLAGS = -L/usr/local/lib -R/usr/local/lib
+-BOOST_PROGRAM_OPTIONS_LIBS = -lboost_program_options-mt
++BOOST_CPPFLAGS = -I/opt/csw/gxx/include
++BOOST_PROGRAM_OPTIONS_LDFLAGS = -L/opt/csw/gxx/lib -R/opt/csw/gxx/lib
++BOOST_PROGRAM_OPTIONS_LIBS = -lboost_program_options
+ BOOST_ROOT =
+-BOOST_SERIALIZATION_LDFLAGS = -L/usr/local/lib -R/usr/local/lib
+-BOOST_SERIALIZATION_LIBS = -lboost_serialization-mt
+-CC = gcc
++BOOST_SERIALIZATION_LDFLAGS = -L/opt/csw/gxx/lib -R/opt/csw/gxx/lib
++BOOST_SERIALIZATION_LIBS = -lboost_serialization
++CC = /opt/csw/bin/gcc-4.6
+ CCDEPMODE = depmode=gcc3
+ CDB_CFLAGS =
+ CDB_LIBS =
+-CFLAGS = -g -O2
+-CPP = gcc -E
+-CPPFLAGS =
+-CXX = g++
+-CXXCPP = g++ -E
++CFLAGS = -O2 -pipe -mcpu=v9 -D__SPARC__
++CPP = /opt/csw/bin/gcc-4.6 -E
++CPPFLAGS = -I/opt/csw/gxx/include -I/opt/csw/include
++CXX = /opt/csw/bin/g++-4.6
++CXXCPP = /opt/csw/bin/g++-4.6 -E
+ CXXDEPMODE = depmode=gcc3
+-CXXFLAGS = -D_GNU_SOURCE -Wall -O2
++CXXFLAGS = -D_REENTRANT -O2 -pipe -mcpu=v9 -D__SPARC__
+ CYGPATH_W = echo
+ DEFS = -DHAVE_CONFIG_H
+ DEPDIR = .deps
+-DISTCHECK_CONFIGURE_FLAGS = '--with-boost='
++DISTCHECK_CONFIGURE_FLAGS = '--with-boost=/opt/csw/gxx'
+ DSYMUTIL =
+ DUMPBIN =
+-DYNLINKFLAGS = -rdynamic
++DYNLINKFLAGS =
+ ECHO_C =
+ ECHO_N = -n
+ ECHO_T =
+-EGREP = /bin/grep -E
++EGREP = /opt/csw/bin/ggrep -E
+ EXEEXT =
+-FGREP = /bin/grep -F
+-GREP = /bin/grep
+-INSTALL = /usr/bin/install -c
++FGREP = /opt/csw/bin/ggrep -F
++GREP = /opt/csw/bin/ggrep
++INSTALL = /opt/csw/bin/ginstall -c
+ INSTALL_DATA = ${INSTALL} -m 644
+ INSTALL_PROGRAM = ${INSTALL}
+ INSTALL_SCRIPT = ${INSTALL}
+ INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
+-LD = /usr/bin/ld -m elf_x86_64
+-LDFLAGS = -L/opt/postgresql/lib -Wl,-rpath,/opt/postgresql/lib
++LD = /usr/ccs/bin/ld
++LDFLAGS = -L/opt/csw/lib -L/opt/csw/gxx/lib
+ LEX = flex
+ LEXLIB = -lfl
+ LEX_OUTPUT_ROOT = lex.yy
+@@ -99,21 +99,21 @@ LIBCRYPT = -lcrypt
+ LIBDL = -ldl
+ LIBLDAP = ldap_r
+ LIBOBJS =
+-LIBOPENDBX = opendbx
+-LIBS = -lz -lcrypt
++LIBOPENDBX =
++LIBS = -lposix4 -lresolv -lnsl -lsocket -lpthread -lrt -lz
+ LIBTOOL = $(SHELL) $(top_builddir)/libtool
+ LIPO =
+ LN_S = ln -s
+ LTLIBOBJS =
+-LUA_CFLAGS = -I/usr/include/lua5.1
+-LUA_LIBS = -llua5.1
+-MAKEINFO = ${SHELL} /home/ahu/auto-build/pdns/missing --run makeinfo
+-MKDIR_P = /bin/mkdir -p
+-MYSQL_incdir = /usr/include/mysql
+-MYSQL_lib =
+-NM = /usr/bin/nm -B
++LUA_CFLAGS =
++LUA_LIBS =
++MAKEINFO = ${SHELL} /home/wilbury/b/powerdns/branches/pdns-3.1-rc2/work/solaris10-sparc/build-isa-sparcv8plus/pdns-3.1-rc2/missing --run makeinfo
++MKDIR_P = /opt/csw/bin/gmkdir -p
++MYSQL_incdir = /opt/csw/include/mysql
++MYSQL_lib = -L/opt/csw/lib
++NM = /usr/ccs/bin/nm -p
+ NMEDIT =
+-OBJDUMP = objdump
++OBJDUMP = false
+ OBJEXT = o
+ OTOOL =
+ OTOOL64 =
+@@ -125,78 +125,78 @@ PACKAGE_TARNAME =
+ PACKAGE_URL =
+ PACKAGE_VERSION =
+ PATH_SEPARATOR = :
+-PGSQL_incdir = /opt/postgresql/include
+-PGSQL_lib = -L/opt/postgresql/lib -Wl,-rpath,/opt/postgresql/lib
+-PKG_CONFIG = /usr/bin/pkg-config
++PGSQL_incdir =
++PGSQL_lib =
++PKG_CONFIG = /opt/csw/bin/pkg-config
+ RANLIB = ranlib
+-SED = /bin/sed
++SED = /opt/csw/bin/gsed
+ SET_MAKE =
+ SHELL = /bin/bash
+-SQLITE3_CFLAGS =
+-SQLITE3_LIBS = -lsqlite3
+-SQLITE_incdir = /usr/include/
++SQLITE3_CFLAGS = -I/opt/csw/include
++SQLITE3_LIBS = -L/opt/csw/lib -lsqlite3
++SQLITE_incdir =
+ SQLITE_lib =
+ STRIP = strip
+-THREADFLAGS = -pthread
+-UNIXODBC_incdir = /usr/include/
++THREADFLAGS =
++UNIXODBC_incdir =
+ UNIXODBC_lib =
+ VERSION = 3.1-rc2
+ YACC = bison -y
+ YFLAGS =
+-abs_builddir = /home/ahu/auto-build/pdns/codedocs
+-abs_srcdir = /home/ahu/auto-build/pdns/codedocs
+-abs_top_builddir = /home/ahu/auto-build/pdns
+-abs_top_srcdir = /home/ahu/auto-build/pdns
+-ac_ct_CC = gcc
+-ac_ct_CXX = g++
++abs_builddir = /home/wilbury/b/powerdns/branches/pdns-3.1-rc2/work/solaris10-sparc/build-isa-sparcv8plus/pdns-3.1-rc2/codedocs
++abs_srcdir = /home/wilbury/b/powerdns/branches/pdns-3.1-rc2/work/solaris10-sparc/build-isa-sparcv8plus/pdns-3.1-rc2/codedocs
++abs_top_builddir = /home/wilbury/b/powerdns/branches/pdns-3.1-rc2/work/solaris10-sparc/build-isa-sparcv8plus/pdns-3.1-rc2
++abs_top_srcdir = /home/wilbury/b/powerdns/branches/pdns-3.1-rc2/work/solaris10-sparc/build-isa-sparcv8plus/pdns-3.1-rc2
++ac_ct_CC = /opt/csw/bin/gcc-4.6
++ac_ct_CXX =
+ ac_ct_DUMPBIN =
+ am__include = include
+ am__leading_dot = .
+ am__quote =
+ am__tar = ${AMTAR} chof - "$$tardir"
+ am__untar = ${AMTAR} xf -
+-bindir = ${exec_prefix}/bin
+-build = x86_64-unknown-linux-gnu
++bindir = /opt/csw/bin
++build = sparc-sun-solaris2.10
+ build_alias =
+-build_cpu = x86_64
+-build_os = linux-gnu
+-build_vendor = unknown
++build_cpu = sparc
++build_os = solaris2.10
++build_vendor = sun
+ builddir = .
+-datadir = ${datarootdir}
++datadir = /opt/csw/share
+ datarootdir = ${prefix}/share
+ docdir = ${datarootdir}/doc/${PACKAGE}
+ dvidir = ${docdir}
+-exec_prefix = ${prefix}
+-host = x86_64-unknown-linux-gnu
++exec_prefix = /opt/csw
++host = sparc-sun-solaris2.10
+ host_alias =
+-host_cpu = x86_64
+-host_os = linux-gnu
+-host_vendor = unknown
++host_cpu = sparc
++host_os = solaris2.10
++host_vendor = sun
+ htmldir = ${docdir}
+-includedir = ${prefix}/include
+-infodir = ${datarootdir}/info
+-install_sh = ${SHELL} /home/ahu/auto-build/pdns/install-sh
+-libdir = ${exec_prefix}/lib
+-libexecdir = ${exec_prefix}/libexec
++includedir = /opt/csw/include
++infodir = /opt/csw/share/info
++install_sh = ${SHELL} /home/wilbury/b/powerdns/branches/pdns-3.1-rc2/work/solaris10-sparc/build-isa-sparcv8plus/pdns-3.1-rc2/install-sh
++libdir = /opt/csw/lib/pdns
++libexecdir = /opt/csw/libexec
+ localedir = ${datarootdir}/locale
+-localstatedir = ${prefix}/var
++localstatedir = /var/opt/csw
+ lt_ECHO = echo
+-mandir = ${datarootdir}/man
+-mkdir_p = /bin/mkdir -p
+-moduledirs = mydnsbackend gmysqlbackend mongodbbackend luabackend gpgsqlbackend xdbbackend pipebackend oraclebackend pipebackend db2backend odbcbackend ldapbackend gsqlitebackend gsqlite3backend geobackend goraclebackend opendbxbackend godbcbackend
+-modulelibs = -lmysqlclient -lz -lmysqlclient -L/opt/mongo/lib64/ -lmongoclient -lboost_thread -lboost_filesystem -lboost_system -llua5.1 -lpq -lssl -lcrypto -lresolv -lnsl -ltdb -L$(ORACLE_HOME)/lib -lclntsh -lldap_r -llber -lsqlite -lsqlite3 -L$(ORACLE_HOME)/lib -lclient9 -lclntst9 -lopendbx
+-moduleobjects = ../modules/mydnsbackend/mydnsbackend.o ../modules/gmysqlbackend/gmysqlbackend.o ../modules/gmysqlbackend/smysql.o ../modules/mongodbbackend/mongodbbackend.o ../modules/mongodbbackend/minimal.o ../modules/mongodbbackend/slave.o ../modules/mongodbbackend/master.o ../modules/mongodbbackend/reload.o ../modules/mongodbbackend/private.o ../modules/mongodbbackend/dnssec.o ../modules/mongodbbackend/supermaster.o ../modules/mongodbbackend/crc32.o ../modules/luabackend/luabackend.o ../modules/luabackend/minimal.o ../modules/luabackend/reload.o ../modules/luabackend/lua_functions.o ../modules/luabackend/master.o ../modules/luabackend/private.o ../modules/luabackend/slave.o ../modules/luabackend/supermaster.o ../modules/luabackend/dnssec.o ../modules/gpgsqlbackend/gpgsqlbackend.o ../modules/gpgsqlbackend/spgsql.o ../modules/xdbbackend/xdbbackend.o ../modules/xdbbackend/xtdb.o ../modules/pipebackend/coprocess.o ../modules/pipebackend/pipebackend.o ../modules/oraclebacke
nd/oraclebackend.o ../modules/pipebackend/coprocess.o ../modules/pipebackend/pipebackend.o ../modules/db2backend/DB2Backend.o ../modules/ldapbackend/ldapbackend.o ../modules/ldapbackend/powerldap.o ../modules/gsqlitebackend/gsqlitebackend.o ../modules/gsqlitebackend/ssqlite.o ../modules/gsqlite3backend/gsqlite3backend.o ../modules/geobackend/geobackend.o ../modules/geobackend/ippreftree.o ../modules/goraclebackend/goraclebackend.o ../modules/goraclebackend/soracle.o ../modules/opendbxbackend/odbxbackend.o ../modules/opendbxbackend/odbxprivate.o
++mandir = /opt/csw/share/man
++mkdir_p = /opt/csw/bin/gmkdir -p
++moduledirs = ldapbackend geobackend gmysqlbackend gsqlite3backend pipebackend
++modulelibs = -lldap_r -llber -lmysqlclient -lsqlite3
++moduleobjects = ../modules/ldapbackend/ldapbackend.o ../modules/ldapbackend/powerldap.o ../modules/geobackend/geobackend.o ../modules/geobackend/ippreftree.o ../modules/gmysqlbackend/gmysqlbackend.o ../modules/gmysqlbackend/smysql.o ../modules/gsqlite3backend/gsqlite3backend.o
+ oldincludedir = /usr/include
+ pdfdir = ${docdir}
+-prefix = /usr/local
++prefix = /opt/csw
+ program_transform_name = s,x,x,
+ programdescend = pdns
+ psdir = ${docdir}
+-sbindir = ${exec_prefix}/sbin
+-sharedstatedir = ${prefix}/com
++sbindir = /opt/csw/sbin
++sharedstatedir = /opt/csw/share
+ socketdir = /var/run
+ srcdir = .
+-sysconfdir = ${prefix}/etc
++sysconfdir = /etc//opt/csw/pdns
+ target_alias =
+ top_build_prefix = ../
+ top_builddir = ..
+diff --git a/pdns/epollmplexer.cc b/pdns/epollmplexer.cc
+index b5e2276..2ed03dc 100644
+--- a/pdns/epollmplexer.cc
++++ b/pdns/epollmplexer.cc
+@@ -1,3 +1,5 @@
++#if 0
++
+ #include "mplexer.hh"
+ #include "sstuff.hh"
+ #include <iostream>
+@@ -135,7 +137,6 @@ int EpollFDMultiplexer::run(struct timeval* now)
+ return 0;
+ }
+
+-#if 0
+ void acceptData(int fd, funcparam_t& parameter)
+ {
+ cout<<"Have data on fd "<<fd<<endl;
+--
+1.7.10
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the devel
mailing list