From 09db49f6a63bf5200f6ad752a25aaec649299238 Mon Sep 17 00:00:00 2001
From: Stefan Saraev <stefan@saraev.ca>
Date: Sun, 6 Oct 2013 14:41:04 +0300
Subject: [PATCH] tntnet: update to tntnet-2.2. disable broken autoreconf.
 disable ssl

---
 packages/3rdparty/web/tntnet/build             |  4 ++--
 packages/3rdparty/web/tntnet/meta              |  4 ++--
 .../tntnet/patches/tntnet-2.2-fix_gcc47.patch  | 18 ++++++++++++++++++
 3 files changed, 22 insertions(+), 4 deletions(-)
 create mode 100644 packages/3rdparty/web/tntnet/patches/tntnet-2.2-fix_gcc47.patch

diff --git a/packages/3rdparty/web/tntnet/build b/packages/3rdparty/web/tntnet/build
index 5177674c48..fecf46c489 100755
--- a/packages/3rdparty/web/tntnet/build
+++ b/packages/3rdparty/web/tntnet/build
@@ -34,7 +34,6 @@ mkdir -p .build-host && cd .build-host
             --disable-static \
             --enable-shared \
             --with-server=no \
-            --with-cgi=no \
             --with-sdk=yes \
             --with-demos=no \
             --with-epoll=yes \
@@ -58,11 +57,12 @@ mkdir -p .build-target && cd .build-target
             --sysconfdir=/etc \
             --disable-static \
             --enable-shared \
+            --with-sysroot=$SYSROOT_PREFIX \
             --with-server=no \
-            --with-cgi=no \
             --with-sdk=yes \
             --with-demos=no \
             --with-epoll=yes \
+            --with-ssl=no \
             --with-stressjob=no
 
 $MAKEINSTALL
diff --git a/packages/3rdparty/web/tntnet/meta b/packages/3rdparty/web/tntnet/meta
index c12c5ccb94..eb6ecf065d 100644
--- a/packages/3rdparty/web/tntnet/meta
+++ b/packages/3rdparty/web/tntnet/meta
@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="tntnet"
-PKG_VERSION="2.1"
+PKG_VERSION="2.2"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL-2"
@@ -33,4 +33,4 @@ PKG_SHORTDESC="tntnet: C++ Dynamite for the Web"
 PKG_LONGDESC="Tntnet is a modular, multithreaded, high performance webapplicationserver for C++"
 PKG_IS_ADDON="no"
 
-PKG_AUTORECONF="yes"
+PKG_AUTORECONF="no"
diff --git a/packages/3rdparty/web/tntnet/patches/tntnet-2.2-fix_gcc47.patch b/packages/3rdparty/web/tntnet/patches/tntnet-2.2-fix_gcc47.patch
new file mode 100644
index 0000000000..a21d34f9b7
--- /dev/null
+++ b/packages/3rdparty/web/tntnet/patches/tntnet-2.2-fix_gcc47.patch
@@ -0,0 +1,18 @@
+Description: Include unistd.h to fix FTBFS with gcc-4.7
+ tntnet (2.1-1ubuntu1) quantal; urgency=low
+ .
+   * Add missing header to fix FTBFS with gcc4.7 on non-amd64 archs
+Author: Micah Gersten <micahg@ubuntu.com>
+
+Index: tntnet-2.2/framework/defcomp/static.cpp
+===================================================================
+--- tntnet-2.2.orig/framework/defcomp/static.cpp	2013-04-21 22:13:57.000000000 +0300
++++ tntnet-2.2/framework/defcomp/static.cpp	2013-05-19 23:12:17.000000000 +0300
+@@ -34,6 +34,7 @@
+ #include <tnt/http.h>
+ #include <tnt/httpheader.h>
+ #include <tnt/comploader.h>
++#include <unistd.h>
+ #include <fstream>
+ #include <cxxtools/log.h>
+ #include <cxxtools/systemerror.h>