diff options
| l--------- | patches/fam-2.7.0/autogen.sh | 1 | ||||
| -rw-r--r-- | patches/fam-2.7.0/fam-2.7.0-includes.diff | 67 | ||||
| -rw-r--r-- | patches/fam-2.7.0/series | 1 | ||||
| -rw-r--r-- | rules/fam.in | 1 | ||||
| -rw-r--r-- | rules/fam.make | 40 |
5 files changed, 92 insertions, 18 deletions
diff --git a/patches/fam-2.7.0/autogen.sh b/patches/fam-2.7.0/autogen.sh new file mode 120000 index 000000000..9f8a4cb7d --- /dev/null +++ b/patches/fam-2.7.0/autogen.sh @@ -0,0 +1 @@ +../autogen.sh
\ No newline at end of file diff --git a/patches/fam-2.7.0/fam-2.7.0-includes.diff b/patches/fam-2.7.0/fam-2.7.0-includes.diff new file mode 100644 index 000000000..e977f4d5f --- /dev/null +++ b/patches/fam-2.7.0/fam-2.7.0-includes.diff @@ -0,0 +1,67 @@ +Subject: [patch] fix issues with newer compilers +From: Robert Schwebel <r.schwebel@pengutronix.de> + +The fam packet has several issues with newer gcc compilers, which are +fixed by this patch. + +Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de> + +--- + include/BTree.h | 2 ++ + lib/Client.c++ | 2 +- + src/IMon.c++ | 2 +- + src/Interest.h | 2 ++ + 4 files changed, 6 insertions(+), 2 deletions(-) + +Index: fam-2.7.0/lib/Client.c++ +=================================================================== +--- fam-2.7.0.orig/lib/Client.c++ ++++ fam-2.7.0/lib/Client.c++ +@@ -34,7 +34,7 @@ + #include <syslog.h> + #include <errno.h> + +-#include <iostream.h> ++#include <iostream> + + #include "fam.h" + #include "Client.h" +Index: fam-2.7.0/src/Interest.h +=================================================================== +--- fam-2.7.0.orig/src/Interest.h ++++ fam-2.7.0/src/Interest.h +@@ -23,6 +23,8 @@ + #ifndef Interest_included + #define Interest_included + ++#include <cstdlib> ++ + #include <sys/stat.h> + #include <sys/types.h> + #include <sys/time.h> +Index: fam-2.7.0/src/IMon.c++ +=================================================================== +--- fam-2.7.0.orig/src/IMon.c++ ++++ fam-2.7.0/src/IMon.c++ +@@ -40,7 +40,7 @@ + #include "Interest.h" + #include "Log.h" + #include "Scheduler.h" +-#include "alloc.h" ++#include <cstdlib> + + int IMon::imonfd = -2; + IMon::EventHandler IMon::ehandler = NULL; +Index: fam-2.7.0/include/BTree.h +=================================================================== +--- fam-2.7.0.orig/include/BTree.h ++++ fam-2.7.0/include/BTree.h +@@ -23,6 +23,8 @@ + #ifndef BTree_included + #define BTree_included + ++#include <cstdlib> ++ + #include "Boolean.h" + + // This is an in-core B-Tree implementation. diff --git a/patches/fam-2.7.0/series b/patches/fam-2.7.0/series new file mode 100644 index 000000000..5c77bed8d --- /dev/null +++ b/patches/fam-2.7.0/series @@ -0,0 +1 @@ +fam-2.7.0-includes.diff diff --git a/rules/fam.in b/rules/fam.in index ee515765f..9b470b4e0 100644 --- a/rules/fam.in +++ b/rules/fam.in @@ -3,7 +3,6 @@ menuconfig FAM tristate - depends on BROKEN prompt "fam " select PORTMAP select GCCLIBS_CXX diff --git a/rules/fam.make b/rules/fam.make index a7458c82c..a6f38f9d9 100644 --- a/rules/fam.make +++ b/rules/fam.make @@ -31,6 +31,20 @@ $(FAM_SOURCE): @$(call get, FAM) # ---------------------------------------------------------------------------- +# Extract +# ---------------------------------------------------------------------------- + +$(STATEDIR)/fam.extract: + @$(call targetinfo) + @$(call clean, $(FAM_DIR)) + @$(call extract, FAM, $(FAM_BUILDDIR)) + # configure has incorrect permissions + chmod 755 $(FAM_DIR)/configure + @$(call patchin, FAM, $(FAM_SRCDIR)) + mkdir -p $(FAM_DIR) + @$(call touch) + +# ---------------------------------------------------------------------------- # Prepare # ---------------------------------------------------------------------------- @@ -40,9 +54,7 @@ FAM_ENV := $(CROSS_ENV) # # autoconf # -FAM_AUTOCONF := \ - $(CROSS_AUTOCONF_USR) \ - --disable-dependency-tracking +FAM_AUTOCONF := $(CROSS_AUTOCONF_USR) # ---------------------------------------------------------------------------- # Target-Install @@ -56,36 +68,30 @@ $(STATEDIR)/fam.targetinstall: @$(call install_fixup,fam,PRIORITY,optional) @$(call install_fixup,fam,VERSION,$(FAM_VERSION)) @$(call install_fixup,fam,SECTION,base) - @$(call install_fixup,fam,AUTHOR,"Juergen Beisert <j.beisert\@pengutronix.de>") + @$(call install_fixup,fam,AUTHOR,"Juergen Beisert <j.beisert@pengutronix.de>") @$(call install_fixup,fam,DEPENDS,) @$(call install_fixup,fam,DESCRIPTION,missing) - @$(call install_copy, fam, 0, 0, 0755, $(FAM_DIR)/src/famd, \ - /usr/sbin/famd) + @$(call install_copy, fam, 0, 0, 0755, -, /usr/sbin/famd) ifdef PTXCONF_FAM_DEFAULT_CONF - @$(call install_copy, fam, 0, 0, 0755, $(FAM_DIR)/conf/fam.conf, \ - /etc/fam.conf, n) + @$(call install_copy, fam, 0, 0, 0755, -, /etc/fam.conf, n) endif ifdef PTXCONF_FAM_LIBRARY - @$(call install_copy, fam, 0, 0, 0644, \ - $(FAM_DIR)/lib/.libs/libfam.so.0.0.0, \ - /usr/lib/libfam.so.0.0.0) - @$(call install_link, fam, /usr/lib/libfam.so.0.0.0, \ - /usr/lib/libfam.so.0) - @$(call install_link, fam, /usr/lib/libfam.so.0.0.0, \ - /usr/lib/libfam.so) + @$(call install_copy, fam, 0, 0, 0644, -, /usr/lib/libfam.so.0.0.0) + @$(call install_link, fam, libfam.so.0.0.0, /usr/lib/libfam.so.0) + @$(call install_link, fam, libfam.so.0.0.0, /usr/lib/libfam.so) endif ifdef PTXCONF_FAM_STARTUP_TYPE_STANDALONE ifdef PTXCONF_INITMETHOD_BBINIT ifdef PTXCONF_FAM_STARTSCRIPT - @$(call install_alternative, fam, 0, 0, 0755, /etc/init.d/famd, n) + @$(call install_alternative, fam, 0, 0, 0755, /etc/init.d/famd) endif endif endif ifdef PTXCONF_FAM_INETD_SERVER - @$(call install_alternative, fam, 0, 0, 0644, /etc/inetd.conf.d/fam, n) + @$(call install_alternative, fam, 0, 0, 0644, /etc/inetd.conf.d/fam) endif @$(call install_finish,fam) |