Carsten Schlote wrote: > From: Carsten Schlote <c.schl...@konzeptpark.de> > > This target build is required for other target tools or > for included attr control functions. > > Signed-off-by: Carsten Schlote <c.schl...@konzeptpark.de> > --- > rules/attr.in | 7 ++++++- > rules/attr.make | 26 ++++++++++++++++++++++++-- > 2 files changed, 30 insertions(+), 3 deletions(-) > > diff --git a/rules/attr.in b/rules/attr.in > index 4e4fa56..196df22 100644 > --- a/rules/attr.in > +++ b/rules/attr.in > @@ -5,12 +5,17 @@ menuconfig ATTR > select HOST_GETTEXT if ATTR_GETTEXT > prompt "attr " > help > - > This is the extended attributes project for the ext2 and ext3 > filesystems. For reference, have a look at the project homepage: > > http://acl.bestbits.at/ > > +config ATTR_SHARED > + bool > + depends on ATTR > + default y > + prompt "Install shared lib" > + > config ATTR_GETTEXT > bool > depends on ATTR > diff --git a/rules/attr.make b/rules/attr.make > index b78c61c..bb003a3 100644 > --- a/rules/attr.make > +++ b/rules/attr.make > @@ -23,6 +23,8 @@ ATTR_SOURCE := $(SRCDIR)/$(ATTR).src.$(ATTR_SUFFIX) > ATTR_DIR := $(BUILDDIR)/$(ATTR) > > ATTR_URL := \ > + http://mirrors.zerg.biz/nongnu/attr/$(ATTR).src.$(ATTR_SUFFIX) \ > + http://mirror.dknss.com/nongnu/attr/$(ATTR).src.$(ATTR_SUFFIX) \ > ftp://oss.sgi.com/projects/xfs/cmd_tars/$(ATTR).src.$(ATTR_SUFFIX) \ > > ftp://oss.sgi.com/projects/xfs/previous/cmd_tars/$(ATTR).src.$(ATTR_SUFFIX) \ > > ftp://oss.sgi.com/projects/xfs/cmd_tars-oct_09/$(ATTR).src.$(ATTR_SUFFIX) > @@ -49,7 +51,13 @@ ATTR_ENV := \ > # > ATTR_AUTOCONF := \ > $(CROSS_AUTOCONF_USR) \ > - --disable-shared > + --libexecdir=/usr/lib
does it actually install something to libexecdir? IMHO it should be /usr/lib/<package> or /usr/bin > + > +ifdef PTXCONF_ATTR_SHARED > +ATTR_AUTOCONF += --enable-shared > +else > +ATTR_AUTOCONF += --disable-shared > +endif > > ifdef PTXCONF_ATTR_GETTEXT > ATTR_AUTOCONF += --enable-gettext > @@ -58,6 +66,15 @@ ATTR_AUTOCONF += --disable-gettext > endif > > # > ---------------------------------------------------------------------------- > +# Install > +# > ---------------------------------------------------------------------------- > + > +$(STATEDIR)/attr.install: > + @$(call targetinfo) > + @$(call install, ATTR) > + @$(call touch) please remove that rule > + > +# > ---------------------------------------------------------------------------- > # Target-Install > # > ---------------------------------------------------------------------------- > > @@ -77,6 +94,11 @@ $(STATEDIR)/attr.targetinstall: > @$(call install_copy, attr, 0, 0, 0755, -, /usr/bin/setfattr) > @$(call install_copy, attr, 0, 0, 0755, -, /usr/bin/getfattr) > > +ifdef PTXCONF_ATTR_SHARED > + @$(call install_copy, attr, 0, 0, 0644, -, /usr/lib/libattr.so.1.1.0) > + @$(call install_link, attr, libattr.so.1.1.0, /usr/lib/libattr.so.1) > + @$(call install_link, attr, libattr.so.1.1.0, /usr/lib/libattr.so) > +endif > @$(call install_finish, attr) > > @$(call touch) > @@ -87,7 +109,7 @@ $(STATEDIR)/attr.targetinstall: > > attr_clean: > rm -rf $(STATEDIR)/attr.* > - rm -rf $(PKGDIR)/attr_* > + rm -rf $(ATTR_PKGDIR)/* > rm -rf $(ATTR_DIR) > > # vim: syntax=make otherwise it looks good Marc -- Pengutronix e.K. | Marc Kleine-Budde | Industrial Linux Solutions | Phone: +49-231-2826-924 | Vertretung West/Dortmund | Fax: +49-5121-206917-5555 | Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de |
signature.asc
Description: OpenPGP digital signature
-- ptxdist mailing list ptxdist@pengutronix.de
