diff options
| author | Robert Schwebel <r.schwebel@pengutronix.de> | 2010-02-02 22:48:44 +0100 |
|---|---|---|
| committer | Robert Schwebel <r.schwebel@pengutronix.de> | 2010-02-02 22:48:44 +0100 |
| commit | b3c0d48743a6356e6c0fad1a55ae45d76ba3ac35 (patch) | |
| tree | 98a724692432163e65da64bbdb0d22d6fcaa6a79 /rules/fam.make | |
| parent | bb35b68fe5791b075265e828e6a39d0234b58362 (diff) | |
| download | ptxdist-b3c0d48743a6356e6c0fad1a55ae45d76ba3ac35.tar.gz ptxdist-b3c0d48743a6356e6c0fad1a55ae45d76ba3ac35.tar.xz | |
[fam] unbreak packet
The fam packet was previously broken; we add some patches to fix
compiler issues with newer g++ compilers and add some more fixes.
Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
Diffstat (limited to 'rules/fam.make')
| -rw-r--r-- | rules/fam.make | 40 |
1 files changed, 23 insertions, 17 deletions
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) |