|
@@ -4,29 +4,18 @@ Date: Mon, 5 Oct 2015 00:52:26 +0100
|
|
|
Subject: [PATCH] Fix cross compilation, based on OpenWRT patch.
|
|
|
|
|
|
[Vincent: tweak the patch for version 0.9.6]
|
|
|
+[Bernd: tweak the patch for version 0.9.7]
|
|
|
|
|
|
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
|
|
|
Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
|
|
|
+Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
|
|
|
---
|
|
|
- configure.ac | 1 -
|
|
|
- scripts/checks.m4 | 2 +-
|
|
|
- scripts/common.m4 | 4 ++--
|
|
|
- 3 files changed, 3 insertions(+), 4 deletions(-)
|
|
|
+ scripts/checks.m4 | 2 +-
|
|
|
+ scripts/common.m4 | 4 ++--
|
|
|
+ 2 files changed, 3 insertions(+), 3 deletions(-)
|
|
|
|
|
|
-diff --git a/configure.ac b/configure.ac
|
|
|
-index ba5bbf2..0821d4e 100644
|
|
|
---- a/configure.ac
|
|
|
-+++ b/configure.ac
|
|
|
-@@ -4,7 +4,6 @@ AC_DEFINE(API_VERSION, 9, api version)
|
|
|
-
|
|
|
- AM_INIT_AUTOMAKE
|
|
|
- AC_CONFIG_HEADERS(config.h)
|
|
|
--AM_PATH_CPPUNIT(1.9.6)
|
|
|
-
|
|
|
- AC_PROG_CXX
|
|
|
- AC_PROG_LIBTOOL
|
|
|
diff --git a/scripts/checks.m4 b/scripts/checks.m4
|
|
|
-index 598f39b..0e5abe0 100644
|
|
|
+index 8d77fc5..c446995 100644
|
|
|
--- a/scripts/checks.m4
|
|
|
+++ b/scripts/checks.m4
|
|
|
@@ -96,7 +96,7 @@ AC_DEFUN([TORRENT_CHECK_KQUEUE], [
|
|
@@ -39,10 +28,10 @@ index 598f39b..0e5abe0 100644
|
|
|
#include <stdlib.h>
|
|
|
#include <unistd.h>
|
|
|
diff --git a/scripts/common.m4 b/scripts/common.m4
|
|
|
-index 5127624..cc68269 100644
|
|
|
+index 9885b03..a0af7e7 100644
|
|
|
--- a/scripts/common.m4
|
|
|
+++ b/scripts/common.m4
|
|
|
-@@ -223,7 +223,7 @@ dnl Need to fix this so that it uses the stuff defined by the system.
|
|
|
+@@ -153,7 +153,7 @@ dnl Need to fix this so that it uses the stuff defined by the system.
|
|
|
AC_DEFUN([TORRENT_CHECK_EXECINFO], [
|
|
|
AC_MSG_CHECKING(for execinfo.h)
|
|
|
|
|
@@ -51,7 +40,7 @@ index 5127624..cc68269 100644
|
|
|
#include <execinfo.h>
|
|
|
int main() { backtrace((void**)0, 0); backtrace_symbols((char**)0, 0); return 0;}
|
|
|
])],
|
|
|
-@@ -238,7 +238,7 @@ AC_DEFUN([TORRENT_CHECK_EXECINFO], [
|
|
|
+@@ -168,7 +168,7 @@ AC_DEFUN([TORRENT_CHECK_EXECINFO], [
|
|
|
AC_DEFUN([TORRENT_CHECK_ALIGNED], [
|
|
|
AC_MSG_CHECKING(the byte alignment)
|
|
|
|
|
@@ -61,5 +50,5 @@ index 5127624..cc68269 100644
|
|
|
int main() {
|
|
|
char buf@<:@8@:>@ = { 0, 0, 0, 0, 1, 0, 0, 0 };
|
|
|
--
|
|
|
-1.7.1
|
|
|
+2.18.0
|
|
|
|