inotify-tools: fix static-only build
authorThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Fri, 18 Jul 2014 22:49:39 +0000 (00:49 +0200)
committerThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Fri, 18 Jul 2014 22:49:39 +0000 (00:49 +0200)
Add a patch to the inotify-tools package to fix static-only
build. Fixes:

  http://autobuild.buildroot.org/results/53e/53e98db373ee0218329a5a9c418f10d7b056b5d3/

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
package/inotify-tools/inotify-tools-01-static-build.patch [new file with mode: 0644]

diff --git a/package/inotify-tools/inotify-tools-01-static-build.patch b/package/inotify-tools/inotify-tools-01-static-build.patch
new file mode 100644 (file)
index 0000000..ee2af02
--- /dev/null
@@ -0,0 +1,47 @@
+From 672a3199615e6bbaa9cc788a67ac45213a528971 Mon Sep 17 00:00:00 2001
+From: Thomas Kho <tkho@facebook.com>
+Date: Thu, 28 Oct 2010 20:21:35 -0700
+Subject: [PATCH] Support building static binaries via --enable-static-binary
+ configure flag
+
+Patch taken from upstream commit
+https://github.com/rvoicilas/inotify-tools/commit/672a3199615e6bbaa9cc788a67ac45213a528971,
+but with only the source code changes kept. The build system changes
+adding the --enable-static-binary is not needed, and not having them
+avoids the need for autoreconfiguring the package.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+diff --git a/libinotifytools/src/inotifytools.c b/libinotifytools/src/inotifytools.c
+index b3feca3..966e828 100644
+--- a/libinotifytools/src/inotifytools.c
++++ b/libinotifytools/src/inotifytools.c
+@@ -150,7 +150,7 @@ static int init = 0;
+ static char* timefmt = 0;
+ static regex_t* regex = 0;
+-int isdir( char const * path );
++static int isdir( char const * path );
+ void record_stats( struct inotify_event const * event );
+ int onestr_to_event(char const * event);
+@@ -193,8 +193,8 @@ int onestr_to_event(char const * event);
+  *
+  * @param  mesg  A human-readable error message shown if assertion fails.
+  */
+-void _niceassert( long cond, int line, char const * file, char const * condstr,
+-                  char const * mesg ) {
++static void _niceassert( long cond, int line, char const * file,
++                  char const * condstr, char const * mesg ) {
+       if ( cond ) return;
+       if ( mesg ) {
+@@ -1594,7 +1594,7 @@ int inotifytools_error() {
+ /**
+  * @internal
+  */
+-int isdir( char const * path ) {
++static int isdir( char const * path ) {
+       static struct stat64 my_stat;
+       if ( -1 == lstat64( path, &my_stat ) ) {