3 files changed, 32 insertions, 9 deletions
diff --git a/packages/dtnrg/dtn_2.5.0.bb b/packages/dtnrg/dtn_2.5.0.bb
index 5975a29e7c..3878829ce5 100644
--- a/packages/dtnrg/dtn_2.5.0.bb
+++ b/packages/dtnrg/dtn_2.5.0.bb
@@ -3,29 +3,30 @@ HOMEPAGE = "http://www.dtnrg.org/wiki"
 SECTION = "libs"
 DEPENDS = "db openssl python-native xerces-c"
 LICENSE = "Apache"
-SRC_URI = "http://www.dtnrg.org/docs/code/dtn_${PV}.tgz"
-PR = "r2"
+SRC_URI = "http://www.dtnrg.org/docs/code/dtn_${PV}.tgz \
+           file://configure_fix.patch;patch=1"
+PR = "r3"
 
 inherit autotools
 
 EXTRA_OECONF = "\
   --with-python=${STAGING_BINDIR_NATIVE}/python \
-  --with-db=${STAGING_DIR} \
-  --with-tcl=${STAGING_DIR} \
+  --with-db=${STAGING_DIR_HOST}${layout_exec_prefix} \
+  --with-tcl=${STAGING_DIR_HOST}${layout_exec_prefix} \
   --without-google-perftools \
   --without-bluez \
   --without-bonjour \
-  --with-expat=${STAGING_DIR} \
-  --with-xerces-c=${STAGING_DIR} \
+  --with-expat=${STAGING_DIR_HOST}${layout_exec_prefix} \
+  --with-xerces-c=${STAGING_DIR_HOST}${layout_exec_prefix} \
   --without-tclreadline \
-  --with-zlib=${STAGING_DIR} \
+  --with-zlib=${STAGING_DIR_HOST}${layout_exec_prefix} \
   --without-xsd-tool \
-  --with-db=${STAGING_DIR} \
+  --with-db=${STAGING_DIR_HOST}${layout_exec_prefix} \
   --enable-ecl \
   --enable-edp \
   --without-mysql \
   --without-postgres \
-  --with-openssl=${STAGING_DIR} \
+  --with-openssl=${STAGING_DIR_HOST}${layout_exec_prefix} \
 "
 
 def dtn_python_dir(d):
diff --git a/packages/dtnrg/files/.mtn2git_empty b/packages/dtnrg/files/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/dtnrg/files/.mtn2git_empty
diff --git a/packages/dtnrg/files/configure_fix.patch b/packages/dtnrg/files/configure_fix.patch
new file mode 100644
index 0000000000..95587c242c
--- /dev/null
+++ b/packages/dtnrg/files/configure_fix.patch
@@ -0,0 +1,22 @@
+head no longer supports "-1" syntax
+
+Index: dtn-2.5.0/oasys/aclocal/gcc.ac
+===================================================================
+--- dtn-2.5.0.orig/oasys/aclocal/gcc.ac	2008-02-27 22:38:22.000000000 +0000
++++ dtn-2.5.0/oasys/aclocal/gcc.ac	2008-02-27 22:39:05.000000000 +0000
+@@ -83,13 +83,13 @@
+     dnl Figure out the version and set version-specific options
+     dnl
+     AC_CACHE_CHECK(for the version of the GNU C compiler, oasys_cv_prog_gccver, [
+-      oasys_cv_prog_gccver=`$CC --version | head -1`
++      oasys_cv_prog_gccver=`$CC --version | head -n 1`
+       oasys_cv_prog_gccver=`echo $oasys_cv_prog_gccver | sed 's/.*gcc.*(GCC) //'`
+       oasys_cv_prog_gccver=`echo $oasys_cv_prog_gccver | sed 's/ .*//'`
+     ])      
+ 
+     AC_CACHE_CHECK(for the version of the GNU C++ compiler, oasys_cv_prog_gxxver, [
+-      oasys_cv_prog_gxxver=`$CXX --version | head -1`
++      oasys_cv_prog_gxxver=`$CXX --version | head -n 1`
+       oasys_cv_prog_gxxver=`echo $oasys_cv_prog_gxxver | sed 's/.*g++.*(GCC) //'`
+       oasys_cv_prog_gxxver=`echo $oasys_cv_prog_gxxver | sed 's/ .*//'`
+     ])