summaryrefslogtreecommitdiff
path: root/packages/dtnrg
diff options
context:
space:
mode:
authorJohn Lee <john_lee@openmoko.org>2008-03-07 12:40:47 +0000
committerJohn Lee <john_lee@openmoko.org>2008-03-07 12:40:47 +0000
commitb781aba534b1c5ba47a00fe9e2caaf8743536100 (patch)
tree2f6d5f780d0aeea2118ca212bb905d445313ee95 /packages/dtnrg
parentbd4028cfd4a24a0c5875e7445bb115619830b947 (diff)
parente906546390539db91733531aa8007a59fcc3b60f (diff)
merge of '211b2bf7086145ba83e7b54cebded9bb3025b075'
and 'cb58be96e7128aa032b10e0b9d369ca6f59af487'
Diffstat (limited to 'packages/dtnrg')
-rw-r--r--packages/dtnrg/files/.mtn2git_empty0
-rw-r--r--packages/dtnrg/files/configure_fix.patch22
2 files changed, 22 insertions, 0 deletions
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/ .*//'`
+ ])