diff options
author | Robert Schwebel <r.schwebel@pengutronix.de> | 2008-05-05 21:19:34 +0000 |
---|---|---|
committer | Robert Schwebel <r.schwebel@pengutronix.de> | 2008-05-05 21:19:34 +0000 |
commit | 2df11fa1aa049659a5f46f2e34e9c03bfc9103af (patch) | |
tree | 335cf4c51b4777e63b21a1f073ca983d3c3469a9 /patches/inotify-tools-3.13 | |
parent | 1bf97f3cf3a3406efb3abb2ea95dbdb522d86b25 (diff) | |
download | ptxdist-2df11fa1aa049659a5f46f2e34e9c03bfc9103af.tar.gz ptxdist-2df11fa1aa049659a5f46f2e34e9c03bfc9103af.tar.xz |
* inotify-tools: added; patch by Brandon Fosdick, heavily
modified by Robert Schwebel
git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-trunk@8114 33e552b5-05e3-0310-8538-816dae2090ed
Diffstat (limited to 'patches/inotify-tools-3.13')
3 files changed, 63 insertions, 0 deletions
diff --git a/patches/inotify-tools-3.13/generic/inotify-tools-3.13-autoreconf.diff b/patches/inotify-tools-3.13/generic/inotify-tools-3.13-autoreconf.diff new file mode 100644 index 000000000..e3b48114c --- /dev/null +++ b/patches/inotify-tools-3.13/generic/inotify-tools-3.13-autoreconf.diff @@ -0,0 +1,25 @@ +diff -ur inotify-tools-3.13/configure inotify-tools-3.13-autoreconf/configure +--- inotify-tools-3.13/configure 2008-05-05 23:10:55.000000000 +0200 ++++ inotify-tools-3.13-autoreconf/configure 2008-05-05 23:13:14.000000000 +0200 +@@ -19675,11 +20033,16 @@ + { echo "$as_me:$LINENO: checking whether sys/inotify.h actually works" >&5 + echo $ECHO_N "checking whether sys/inotify.h actually works... $ECHO_C" >&6; } + if test "$cross_compiling" = yes; then +- { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling +-See \`config.log' for more details." >&5 +-echo "$as_me: error: cannot run test program while cross compiling +-See \`config.log' for more details." >&2;} +- { (exit 1); exit 1; }; } ++ ++ { echo "$as_me:$LINENO: result: cross compiling, assuming yes" >&5 ++echo "${ECHO_T}cross compiling, assuming yes" >&6; }; ++ ++cat >>confdefs.h <<\_ACEOF ++#define SYS_INOTIFY_H_EXISTS_AND_WORKS 1 ++_ACEOF ++ ++ ++ + else + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ diff --git a/patches/inotify-tools-3.13/generic/inotify-tools-3.13-configure-inotify.diff b/patches/inotify-tools-3.13/generic/inotify-tools-3.13-configure-inotify.diff new file mode 100644 index 000000000..be6bd0e0b --- /dev/null +++ b/patches/inotify-tools-3.13/generic/inotify-tools-3.13-configure-inotify.diff @@ -0,0 +1,34 @@ +From: Robert Schwebel <r.schwebel@pengutronix.de> +Subject: configure doesn't care about cross compiling + +When cross compiling, we get this error: + + checking whether sys/inotify.h actually works... configure: error: + cannot run test program while cross compiling + +We assume that if somebody cross compiles, he made sure that the inotify +headers are there and working. + +Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de> + +--- + configure.ac | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +Index: inotify-tools-3.13/configure.ac +=================================================================== +--- inotify-tools-3.13.orig/configure.ac ++++ inotify-tools-3.13/configure.ac +@@ -50,7 +50,11 @@ + [[return (-1 == inotify_init());]] + ), + [AC_MSG_RESULT([yup]); AC_DEFINE([SYS_INOTIFY_H_EXISTS_AND_WORKS],[1],[sys/inotify.h exists and works correctly])], +- [AC_MSG_RESULT([nope, using own inotify headers])] ++ [AC_MSG_RESULT([nope, using own inotify headers])], ++ [ ++ AC_MSG_RESULT([cross compiling, assuming yes]); ++ AC_DEFINE([SYS_INOTIFY_H_EXISTS_AND_WORKS],[1],[sys/inotify.h exists and works correctly]) ++ ] + ) + + diff --git a/patches/inotify-tools-3.13/generic/series b/patches/inotify-tools-3.13/generic/series new file mode 100644 index 000000000..5e0352aa6 --- /dev/null +++ b/patches/inotify-tools-3.13/generic/series @@ -0,0 +1,4 @@ +inotify-tools-3.13-configure-inotify.diff +inotify-tools-3.13-autoreconf.diff + + |