summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Olbrich <m.olbrich@pengutronix.de>2011-02-13 21:25:56 +0100
committerMichael Olbrich <m.olbrich@pengutronix.de>2011-02-14 11:37:28 +0100
commit214904590a6e5f873f9d86cbb98db4f3ddf708aa (patch)
tree62ed15506b0b2a24258d82d57b79295c75b5f309
parent6097e19a055b55bf8c6824f5fefe472393420c46 (diff)
downloadptxdist-214904590a6e5f873f9d86cbb98db4f3ddf708aa.tar.gz
ptxdist-214904590a6e5f873f9d86cbb98db4f3ddf708aa.tar.xz
initng: add patch to fix building with gcc 4.5
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
-rw-r--r--patches/initng-0.6.10.2/0001-inotify-syscalls-don-t-define-inotofy-syscalls-if-al.patch3
-rw-r--r--patches/initng-0.6.10.2/0002-fix-building-with-gcc-4.5.patch56
-rw-r--r--patches/initng-0.6.10.2/series3
3 files changed, 60 insertions, 2 deletions
diff --git a/patches/initng-0.6.10.2/0001-inotify-syscalls-don-t-define-inotofy-syscalls-if-al.patch b/patches/initng-0.6.10.2/0001-inotify-syscalls-don-t-define-inotofy-syscalls-if-al.patch
index 809017f32..6b9de7cbf 100644
--- a/patches/initng-0.6.10.2/0001-inotify-syscalls-don-t-define-inotofy-syscalls-if-al.patch
+++ b/patches/initng-0.6.10.2/0001-inotify-syscalls-don-t-define-inotofy-syscalls-if-al.patch
@@ -1,4 +1,3 @@
-From ffc11e594dffa4d6fc386c41846d0e1ec383239a Mon Sep 17 00:00:00 2001
From: Marc Kleine-Budde <mkl@pengutronix.de>
Date: Fri, 1 Jan 2010 16:08:33 +0100
Subject: [PATCH] inotify-syscalls: don't define inotofy syscalls if already defined
@@ -29,5 +28,5 @@ index 8cfa879..495d592 100644
static inline int inotify_init(void)
{
--
-1.6.5.7
+1.7.2.3
diff --git a/patches/initng-0.6.10.2/0002-fix-building-with-gcc-4.5.patch b/patches/initng-0.6.10.2/0002-fix-building-with-gcc-4.5.patch
new file mode 100644
index 000000000..cc4b13e1d
--- /dev/null
+++ b/patches/initng-0.6.10.2/0002-fix-building-with-gcc-4.5.patch
@@ -0,0 +1,56 @@
+From: Michael Olbrich <m.olbrich@pengutronix.de>
+Date: Sun, 13 Feb 2011 21:06:02 +0100
+Subject: [PATCH] fix building with gcc 4.5
+
+don't build with -Werror. getsid is not declared for glibc < 2.12.
+We cannot fix it for both without warning.
+
+[...]/initng-0.6.10.2/tools/killalli5.c:104:9: error: redundant redeclaration of 'getsid'
+[...]/usr/include/unistd.h:690:16: note: previous declaration of 'getsid' was here
+make[3]: *** [tools/CMakeFiles/killalli5.dir/killalli5.o] Error 1
+
+include sys/stat.h:
+
+[...]/initng-0.6.10.2/plugins/find/initng_find.c: In function 'search_dir':
+[...]/initng-0.6.10.2/plugins/find/initng_find.c:66:2: error: implicit declaration of function 'stat'
+[...]/initng-0.6.10.2/plugins/find/initng_find.c:66:2: error: nested extern declaration of 'stat'
+[...]/initng-0.6.10.2/plugins/find/initng_find.c:66:2: error: implicit declaration of function 'S_ISREG'
+[...]/initng-0.6.10.2/plugins/find/initng_find.c:66:2: error: nested extern declaration of 'S_ISREG'
+[...]/initng-0.6.10.2/plugins/find/initng_find.c:108:3: error: implicit declaration of function 'S_ISDIR'
+[...]/initng-0.6.10.2/plugins/find/initng_find.c:108:3: error: nested extern declaration of 'S_ISDIR'
+make[3]: *** [plugins/find/CMakeFiles/find.dir/initng_find.o] Error 1
+
+Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
+---
+ CMakeLists.txt | 2 +-
+ plugins/find/initng_find.c | 1 +
+ 2 files changed, 2 insertions(+), 1 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 18c5d54..8307378 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -14,7 +14,7 @@ INCLUDE(UsePkgConfig)
+
+ ADD_DEFINITIONS(-DHAVE_CONFIG_H)
+ # Turn on warnings
+-SET(CMAKE_C_FLAGS "-Wall -Werror ${CMAKE_C_FLAGS}")
++SET(CMAKE_C_FLAGS "-Wall ${CMAKE_C_FLAGS}")
+
+ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
+
+diff --git a/plugins/find/initng_find.c b/plugins/find/initng_find.c
+index 195b38c..a1fbcdf 100644
+--- a/plugins/find/initng_find.c
++++ b/plugins/find/initng_find.c
+@@ -27,6 +27,7 @@
+ #include <stdlib.h>
+ #include <assert.h>
+ #include <sys/types.h>
++#include <sys/stat.h>
+ #include <errno.h>
+ #include <dirent.h>
+
+--
+1.7.2.3
+
diff --git a/patches/initng-0.6.10.2/series b/patches/initng-0.6.10.2/series
index b420f4302..87df79dc2 100644
--- a/patches/initng-0.6.10.2/series
+++ b/patches/initng-0.6.10.2/series
@@ -1 +1,4 @@
+# generated by git-ptx-patches
0001-inotify-syscalls-don-t-define-inotofy-syscalls-if-al.patch
+0002-fix-building-with-gcc-4.5.patch
+# eed4787a23748fb0b83720fc51bffe2f - git-ptx-patches magic