Changeset 1431

Timestamp:

10/12/09 23:37:06 (11 months ago)

Author:

ahu

Message:

fix up makecontext for Solaris, thanks to John Levon for pointing out how. Solaris 8 is deprecated from now on.
fix up 'Lua' compilation on Solaris (-llua versus -llua5.1).

Location:

trunk/pdns/pdns

Files:

• Makefile-recursor (modified) (2 diffs)
• mtasker.cc (modified) (3 diffs)
• sysdeps-recursor/Darwin.inc (modified) (1 diff)
• sysdeps-recursor/FreeBSD.inc (modified) (1 diff)
• sysdeps-recursor/Linux.inc (modified) (1 diff)
• sysdeps-recursor/SunOS.inc (modified) (1 diff)

trunk/pdns/pdns/Makefile-recursor

@@ -12 +12 @@
 
 # Lua 5.1 settings
-LUA_CPPFLAGS_CONFIG ?= -I/usr/include/lua5.1
-LUA_LIBS_CONFIG ?= -llua5.1 -rdynamic
-
-# Lua 5.0 settings
-#LUA_CPPFLAGS_CONFIG=-I/usr/include/lua50 
-#LUA_LIBS_CONFIG=-llua50 -llualib50
 
 # static dependencies
@@ -26 +20 @@
 rec_channel.o rec_channel_rec.o selectmplexer.o sillyrecords.o \
 dns_random.o aescrypt.o aeskey.o aes_modes.o aestab.o lua-pdns-recursor.o \
-randomhelper.o md5.o
+randomhelper.o recpacketcache.o dns.o
 
 REC_CONTROL_OBJECTS=rec_channel.o rec_control.o arguments.o 

trunk/pdns/pdns/mtasker.cc

@@ -25 +25 @@
 
     \section copyright Copyright and License
-    MTasker is (c) 2002 - 2006 by bert hubert. It is licensed to you under the terms of the GPL version 2.
+    MTasker is (c) 2002 - 2009 by bert hubert. It is licensed to you under the terms of the GPL version 2.
 
     \section overview High level overview
@@ -256 +256 @@
   
   uc->uc_stack.ss_size = d_stacksize;
-#ifdef SOLARIS8
-  uc->uc_stack.ss_sp = (void*)(((char*)uc->uc_stack.ss_sp)+d_stacksize);
-  makecontext (uc,(void (*)(...))threadWrapper, 5, this, start, d_maxtid, val);
-#else
   makecontext (uc, (void (*)(void))threadWrapper, 4, this, start, d_maxtid, val);
-#endif
+
   d_threads[d_maxtid]=uc;
   d_runQueue.push(d_maxtid++); // will run at next schedule invocation
@@ -290 +286 @@
   }
   if(!d_zombiesQueue.empty()) {
-#ifdef SOLARIS8
-    delete[] (((char *)d_threads[d_zombiesQueue.front()]->uc_stack.ss_sp)-d_stacksize);
-#else
     delete[] (char *)d_threads[d_zombiesQueue.front()]->uc_stack.ss_sp;
-#endif
     delete d_threads[d_zombiesQueue.front()];
     d_threads.erase(d_zombiesQueue.front());

trunk/pdns/pdns/sysdeps-recursor/Darwin.inc

@@ -1 +1 @@
 CXXFLAGS+=-D_XOPEN_SOURCE
+
+LUA_CPPFLAGS_CONFIG ?= -I/usr/include/lua5.1
+LUA_LIBS_CONFIG ?= -llua5.1 -rdynamic
+
+# Lua 5.0 settings
+#LUA_CPPFLAGS_CONFIG=-I/usr/include/lua50 
+#LUA_LIBS_CONFIG=-llua50 -llualib50
+

trunk/pdns/pdns/sysdeps-recursor/FreeBSD.inc

@@ -5 +5 @@
         $(CXX) $(CXXFLAGS) -c $< -o $@ ; true
 
+LUA_CPPFLAGS_CONFIG ?= -I/usr/include/lua5.1
+LUA_LIBS_CONFIG ?= -llua5.1 -rdynamic
+
+# Lua 5.0 settings
+#LUA_CPPFLAGS_CONFIG=-I/usr/include/lua50 
+#LUA_LIBS_CONFIG=-llua50 -llualib50

trunk/pdns/pdns/sysdeps-recursor/Linux.inc

@@ -9 +9 @@
 CFLAGS := $(CFLAGS) -D_GNU_SOURCE
 
+LUA_CPPFLAGS_CONFIG ?= -I/usr/include/lua5.1
+LUA_LIBS_CONFIG ?= -llua5.1 -rdynamic
+
+# Lua 5.0 settings
+#LUA_CPPFLAGS_CONFIG=-I/usr/include/lua50 
+#LUA_LIBS_CONFIG=-llua50 -llualib50
+
+
 optional/epollmplexer.o: epollmplexer.cc
         $(CXX) $(CXXFLAGS) -c $< -o $@ ; true

trunk/pdns/pdns/sysdeps-recursor/SunOS.inc

@@ -3 +3 @@
 endif
 
-LDFLAGS+=-lresolv -lsocket -lnsl
+LDFLAGS+=-lresolv -lsocket -lnsl -ldl
 OS_SPECIFIC_INSTALL=mkdir -p $(DESTDIR)/etc/init.d ; cp pdns-recursor.init.d $(DESTDIR)/etc/init.d/pdns-recursor
 
-OPTIONALS:=optional/portsmplexer.o optional/devpollmplexer.cc
+LUA_LIBS_CONFIG ?= -llua 
+
+CXXFLAGS+= -D__MAKECONTEXT_V2_SOURCE
+
+OPTIONALS:=optional/portsmplexer.o optional/devpollmplexer.o
         
 optional/portsmplexer.o: portsmplexer.cc