From: Carsten Schlote <c.schl...@konzeptpark.de> This target build is required for other target tools or for included acl control functions.
Signed-off-by: Carsten Schlote <c.schl...@konzeptpark.de> --- patches/attr-2.4.44/attr_2.4.44-1.diff | 122 +++++++++++++++++ patches/attr-2.4.44/fix-buildsystem.diff | 210 +++++++++++++++++++++++++++--- patches/attr-2.4.44/series | 5 +- rules/attr.in | 6 + rules/attr.make | 26 ++++- 5 files changed, 347 insertions(+), 22 deletions(-) create mode 100644 patches/attr-2.4.44/attr_2.4.44-1.diff diff --git a/patches/attr-2.4.44/attr_2.4.44-1.diff b/patches/attr-2.4.44/attr_2.4.44-1.diff new file mode 100644 index 0000000..982ca47 --- /dev/null +++ b/patches/attr-2.4.44/attr_2.4.44-1.diff @@ -0,0 +1,122 @@ +--- attr-2.4.44.orig/Makefile ++++ attr-2.4.44/Makefile +@@ -75,7 +75,6 @@ + --bindir=/usr/bin \ + --libdir=/lib \ + --libexecdir=/usr/lib \ +- --enable-lib64=yes \ + --includedir=/usr/include \ + --mandir=/usr/share/man \ + --datadir=/usr/share \ +--- attr-2.4.44.orig/debian/control ++++ attr-2.4.44/debian/control +@@ -3,9 +3,11 @@ + Priority: optional + Maintainer: Nathan Scott <nath...@debian.org> + Uploaders: Niv Sardi <xa...@debian.org>, Anibal Monsalve Salazar <ani...@debian.org> +-Build-Depends: autoconf, debhelper (>= 5), gettext, libtool +-Standards-Version: 3.8.0 +-Homepage: http://oss.sgi.com/projects/xfs/ ++Build-Depends: autoconf, automake, debhelper (>= 7), gettext, libtool ++Standards-Version: 3.8.3 ++Homepage: http://savannah.nongnu.org/projects/attr/ ++Vcs-Git: git://git.savannah.nongnu.org/attr.git ++Vcs-Browser: http://git.savannah.gnu.org/cgit/attr.git + + Package: attr + Depends: ${shlibs:Depends}, ${misc:Depends} +--- attr-2.4.44.orig/debian/compat ++++ attr-2.4.44/debian/compat +@@ -1 +1 @@ +-5 ++7 +--- attr-2.4.44.orig/debian/watch ++++ attr-2.4.44/debian/watch +@@ -1,2 +1,2 @@ + version=3 +-ftp://oss.sgi.com/projects/xfs/cmd_tars/ attr_([\d]+[\d\.]*)-[\d].tar.gz ++http://download.savannah.gnu.org/releases-noredirect/attr/ attr-([\d]+[\d\.]*).src.tar.gz +--- attr-2.4.44.orig/debian/rules ++++ attr-2.4.44/debian/rules +@@ -1,5 +1,7 @@ + #!/usr/bin/make -f + ++export DH_VERBOSE=1 ++ + package = attr + develop = lib$(package)1-dev + library = lib$(package)1 +@@ -50,8 +52,14 @@ + $(pkglib) $(MAKE) -C . install-lib + $(pkgme) $(MAKE) -C build src-manifest + ++ sed "s/^libdir='\/lib'$$/libdir='\/usr\/lib'/" $(dirdev)/usr/lib/libattr.la > $(dirdev)/usr/lib/libattr.la.new ++ mv $(dirdev)/usr/lib/libattr.la.new $(dirdev)/usr/lib/libattr.la ++ + -rm -rf $(dirdev)/usr/share/doc/attr + -rm -rf $(dirlib)/usr/share/doc/attr ++ -rm -rf $(dirlib)/usr/share/locale ++ -rm -rf $(dirlib)/usr/share/man ++ -rm -rf $(dirlib)/usr/bin + + dh_installdocs + dh_installchangelogs +--- attr-2.4.44.orig/debian/copyright ++++ attr-2.4.44/debian/copyright +@@ -1,7 +1,7 @@ + This package was debianized by Nathan Scott nath...@debian.org on + Sun, 19 Nov 2000 07:37:09 -0500. + +-It can be downloaded from ftp://oss.sgi.com/projects/xfs/download/ ++It can be downloaded from http://download.savannah.gnu.org/releases-noredirect/attr/ + + Copyright: + +@@ -16,4 +16,4 @@ + Certain components (as annotated in the source) are licensed + under version 2 of the terms of the GNU General Public License. + On Debian systems, the complete text of the GNU General Public +-License can be found in /usr/share/common-licenses/GPL file. ++License can be found in /usr/share/common-licenses/GPL-2 file. +--- attr-2.4.44.orig/debian/changelog ++++ attr-2.4.44/debian/changelog +@@ -1,3 +1,39 @@ ++attr (1:2.4.44-1) unstable; urgency=low ++ ++ * New upstream release ++ * Fix out-of-date-standards-version ++ * Fix copyright-refers-to-versionless-license-file ++ * Update homepage in debian/control ++ * Add Vcs-Git and Vcs-Browser to debian/control ++ * Update download page in debian/copyright ++ * Update debian/watch ++ * Add automake as a build-dependency ++ ++ -- Anibal Monsalve Salazar <ani...@debian.org> Tue, 25 Aug 2009 11:23:53 +1000 ++ ++attr (1:2.4.43-3) unstable; urgency=low ++ ++ [ Cyril Brulebois ] ++ * Backport the following fix by Petr Salinger from upstream to fix ++ FTBFS on GNU/kFreeBSD (Closes: #531950): [git commit b4636a4e9e] ++ On Linux, ENOATTR aliases to ENODATA. On other operating systems ++ like Irix and BSD*, ENOATTR is a separate error number. Therefore, ++ protect the check on âerr == ENODATAâ with â#ifdef __linux__â in ++ strerror_ea() in both getfattr/getfattr.c and setfattr/setfattr.c ++ ++ [ Anibal Monsalve Salazar ] ++ * Standards version is 3.8.2 ++ * DH compatibility level is 7 ++ * Fix "incorrect-libdir-in-la-file usr/lib/libattr.la /lib != /usr/lib" ++ ++ -- Anibal Monsalve Salazar <ani...@debian.org> Sat, 27 Jun 2009 00:29:24 +1000 ++ ++attr (1:2.4.43-2) unstable; urgency=high ++ ++ * Remove --enable-lib64=yes in Makefile (closes: #514017) ++ ++ -- Anibal Monsalve Salazar <ani...@debian.org> Tue, 10 Feb 2009 20:32:30 +1100 ++ + attr (1:2.4.43-1) unstable; urgency=low + + * New upstream release diff --git a/patches/attr-2.4.44/fix-buildsystem.diff b/patches/attr-2.4.44/fix-buildsystem.diff index 7027061..4721bc6 100644 --- a/patches/attr-2.4.44/fix-buildsystem.diff +++ b/patches/attr-2.4.44/fix-buildsystem.diff @@ -1,30 +1,30 @@ Subject: [patch] attr: make attr DESTDIR aware -From: Robert Schwebel <r.schwe...@pengutronix.de> +From: Carsten Schlote <c.schl...@konzeptpark.de Make DESTDIR aware and use correct libtool commands. -Signed-off-by: Robert Schwebel <r.schwe...@pengutronix.de> +Signed-off-by: Carsten Schlote <c.schl...@konzeptpark.de --- + Makefile | 8 +++++--- + attr/Makefile | 4 ++-- + doc/Makefile | 6 +++--- + getfattr/Makefile | 4 ++-- + include/Makefile | 4 ++-- + include/buildmacros | 37 +++++++++++++++++++------------------ + man/Makefile | 6 ++++++ + setfattr/Makefile | 4 ++-- + 8 files changed, 41 insertions(+), 32 deletions(-) + # 20091213 rsc: submitted as https://savannah.nongnu.org/bugs/index.php?28281 - include/buildmacros | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) -Index: b/include/buildmacros + +Index: attr-2.4.44/include/buildmacros =================================================================== ---- a/include/buildmacros -+++ b/include/buildmacros -@@ -40,7 +40,7 @@ OBJECTS = $(ASFILES:.s=.o) \ - $(LFILES:.l=.o) \ - $(YFILES:%.y=%.tab.o) - --INSTALL = $(TOPDIR)/include/install-sh -o $(PKG_USER) -g $(PKG_GROUP) -+INSTALL = DIST_ROOT=$(DESTDIR) $(TOPDIR)/include/install-sh -o $(PKG_USER) -g $(PKG_GROUP) - - SHELL = /bin/sh - IMAGES_DIR = $(TOPDIR)/all-images -@@ -55,10 +55,10 @@ LIBNAME = $(basename $(LTLIBRARY)) +--- attr-2.4.44.orig/include/buildmacros 2009-07-31 11:02:14.000000000 +0200 ++++ attr-2.4.44/include/buildmacros 2009-12-15 17:41:11.000000000 +0100 +@@ -55,10 +55,11 @@ LTOBJECTS = $(OBJECTS:.o=.lo) LTVERSION = $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) @@ -33,8 +33,182 @@ Index: b/include/buildmacros LTEXEC = $(LIBTOOL) --mode=execute -LTINSTALL = $(LIBTOOL) --mode=install $(INSTALL) -LTCOMPILE = $(LIBTOOL) --mode=compile $(CCF) -+LTINSTALL = DIST_ROOT=$(DESTDIR) $(LIBTOOL) --mode=install $(TOPDIR)/install-sh -o $(PKG_USER) -g $(PKG_GROUP) ++LTINSTALL = ${LIBTOOL} --mode=install $(TOPDIR)/install-sh -o $(PKG_USER) -g $(PKG_GROUP) ++#DIST_ROOT=$(DESTDIR) +LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CCF) ifeq ($(ENABLE_SHARED),yes) LTLDFLAGS += -rpath $(PKG_LIB_DIR) +@@ -68,9 +69,9 @@ + ifeq ($(ENABLE_SHARED),yes) + INSTALL_LTLIB = \ + cd $(TOPDIR)/$(LIBNAME)/.libs; \ +- ../$(INSTALL) -m 755 -d $(PKG_LIB_DIR); \ +- ../$(INSTALL) -m 644 -T so_dot_version $(LIBNAME).lai $(PKG_LIB_DIR); \ +- ../$(INSTALL) -T so_dot_current $(LIBNAME).lai $(PKG_LIB_DIR) ++ ../$(INSTALL) -m 755 -d $(DESTDIR)$(PKG_LIB_DIR); \ ++ ../$(INSTALL) -m 644 -T so_dot_version $(LIBNAME).lai $(DESTDIR)$(PKG_LIB_DIR); \ ++ ../$(INSTALL) -T so_dot_current $(LIBNAME).lai $(DESTDIR)$(PKG_LIB_DIR) + endif + + # Libtool thinks the static and shared libs should be in the same dir, so +@@ -82,15 +83,15 @@ + ifeq ($(ENABLE_SHARED),yes) + INSTALL_LTLIB_DEV = \ + cd $(TOPDIR)/$(LIBNAME)/.libs; \ +- ../$(INSTALL) -m 755 -d $(PKG_DEVLIB_DIR); \ +- ../$(INSTALL) -m 644 -T old_lib $(LIBNAME).lai $(PKG_DEVLIB_DIR); \ +- ../$(INSTALL) -m 644 $(LIBNAME).lai $(PKG_DEVLIB_DIR)/$(LIBNAME).la ; \ +- ../$(INSTALL) -m 755 -d $(PKG_LIB_DIR); \ +- ../$(INSTALL) -T so_base $(LIBNAME).lai $(PKG_LIB_DIR); \ ++ ../$(INSTALL) -m 755 -d $(DESTDIR)$(PKG_DEVLIB_DIR); \ ++ ../$(INSTALL) -m 644 -T old_lib $(LIBNAME).lai $(DESTDIR)$(PKG_DEVLIB_DIR); \ ++ ../$(INSTALL) -m 644 $(LIBNAME).lai $(DESTDIR)$(PKG_DEVLIB_DIR)/$(LIBNAME).la ; \ ++ ../$(INSTALL) -m 755 -d $(DESTDIR)$(PKG_LIB_DIR); \ ++ ../$(INSTALL) -T so_base $(LIBNAME).lai $(DESTDIR)$(PKG_LIB_DIR); \ + if test "x$(PKG_DEVLIB_DIR)" != "x$(PKG_LIB_DIR)" ; then \ +- ../$(INSTALL) -S $(PKG_DEVLIB_DIR)/$(LIBNAME).a $(PKG_LIB_DIR)/$(LIBNAME).a; \ +- ../$(INSTALL) -S $(PKG_DEVLIB_DIR)/$(LIBNAME).la $(PKG_LIB_DIR)/$(LIBNAME).la; \ +- ../$(INSTALL) -S $(PKG_LIB_DIR)/$(LIBNAME).so $(PKG_DEVLIB_DIR)/$(LIBNAME).so; \ ++ ../$(INSTALL) -S $(PKG_DEVLIB_DIR)/$(LIBNAME).a $(DESTDIR)$(PKG_LIB_DIR)/$(LIBNAME).a; \ ++ ../$(INSTALL) -S $(PKG_DEVLIB_DIR)/$(LIBNAME).la $(DESTDIR)$(PKG_LIB_DIR)/$(LIBNAME).la; \ ++ ../$(INSTALL) -S $(PKG_LIB_DIR)/$(LIBNAME).so $(DESTDIR)$(PKG_DEVLIB_DIR)/$(LIBNAME).so; \ + fi + else + INSTALL_LTLIB_DEV = $(INSTALL_LTLIB_STATIC) +@@ -98,8 +99,8 @@ + + INSTALL_LTLIB_STATIC = \ + cd $(TOPDIR)/$(LIBNAME)/.libs; \ +- ../$(INSTALL) -m 755 -d $(PKG_DEVLIB_DIR); \ +- ../$(INSTALL) -m 644 -T old_lib $(LIBNAME).lai $(PKG_DEVLIB_DIR) ++ ../$(INSTALL) -m 755 -d $(DESTDIR)$(PKG_DEVLIB_DIR); \ ++ ../$(INSTALL) -m 644 -T old_lib $(LIBNAME).lai $(DESTDIR)$(PKG_DEVLIB_DIR) + + INSTALL_MAN = \ + @for d in $(MAN_PAGES); do \ +@@ -132,8 +133,8 @@ + @for l in $(LINGUAS) ""; do \ + if test -f "$$l.mo" ; then \ + ldir=$(PKG_LOCALE_DIR)/$$l/LC_MESSAGES; \ +- $(INSTALL) -m 755 -d $$ldir; \ +- $(INSTALL) -m 644 $$l.mo $$ldir/$(PKG_NAME).mo; \ ++ $(INSTALL) -m 755 -d $(DESTDIR)$$ldir; \ ++ $(INSTALL) -m 644 $$l.mo $(DESTDIR)$$ldir/$(PKG_NAME).mo; \ + fi; \ + done + endif +Index: attr-2.4.44/Makefile +=================================================================== +--- attr-2.4.44.orig/Makefile 2009-12-15 17:38:11.000000000 +0100 ++++ attr-2.4.44/Makefile 2009-12-15 17:41:11.000000000 +0100 +@@ -88,9 +88,11 @@ + $(MAKE) $(AM_MAKEFLAGS) include/builddefs; \ + fi + +-install: default $(addsuffix -install,$(SUBDIRS)) +- $(INSTALL) -m 755 -d $(PKG_DOC_DIR) +- $(INSTALL) -m 644 README $(PKG_DOC_DIR) ++install: install-bin install-dev install-lib ++ ++install-bin: default $(addsuffix -install,$(SUBDIRS)) ++ $(INSTALL) -m 755 -d $(DESTDIR)$(PKG_DOC_DIR) ++ $(INSTALL) -m 644 README $(DESTDIR)$(PKG_DOC_DIR) + + install-dev: default $(addsuffix -install-dev,$(SUBDIRS)) + +Index: attr-2.4.44/attr/Makefile +=================================================================== +--- attr-2.4.44.orig/attr/Makefile 2009-07-31 11:02:14.000000000 +0200 ++++ attr-2.4.44/attr/Makefile 2009-12-15 17:41:11.000000000 +0100 +@@ -29,6 +29,6 @@ + include $(BUILDRULES) + + install: default +- $(INSTALL) -m 755 -d $(PKG_BIN_DIR) +- $(LTINSTALL) -m 755 $(LTCOMMAND) $(PKG_BIN_DIR) ++ $(INSTALL) -m 755 -d $(DESTDIR)$(PKG_BIN_DIR) ++ $(LTINSTALL) -m 755 $(LTCOMMAND) $(DESTDIR)$(PKG_BIN_DIR) + install-dev install-lib: +Index: attr-2.4.44/doc/Makefile +=================================================================== +--- attr-2.4.44.orig/doc/Makefile 2009-07-31 11:02:14.000000000 +0200 ++++ attr-2.4.44/doc/Makefile 2009-12-15 17:41:11.000000000 +0100 +@@ -32,12 +32,12 @@ + + install: default + $(SUBDIRS_MAKERULE) +- $(INSTALL) -m 755 -d $(PKG_DOC_DIR) +- $(INSTALL) -m 644 PORTING CHANGES.gz $(PKG_DOC_DIR) ++ $(INSTALL) -m 755 -d $(DESTDIR)$(PKG_DOC_DIR) ++ $(INSTALL) -m 644 PORTING CHANGES.gz $(DESTDIR)$(PKG_DOC_DIR) + ifeq ($(PKG_DISTRIBUTION), debian) + $(INSTALL) -S CHANGES.gz $(PKG_DOC_DIR)/changelog.gz + else +- $(INSTALL) -m 644 COPYING $(PKG_DOC_DIR) ++ $(INSTALL) -m 644 COPYING $(DESTDIR)$(PKG_DOC_DIR) + endif + + install-dev install-lib: $(SUBDIRS) +Index: attr-2.4.44/getfattr/Makefile +=================================================================== +--- attr-2.4.44.orig/getfattr/Makefile 2009-07-31 11:02:14.000000000 +0200 ++++ attr-2.4.44/getfattr/Makefile 2009-12-15 17:41:11.000000000 +0100 +@@ -30,6 +30,6 @@ + include $(BUILDRULES) + + install: default +- $(INSTALL) -m 755 -d $(PKG_BIN_DIR) +- $(LTINSTALL) -m 755 $(LTCOMMAND) $(PKG_BIN_DIR) ++ $(INSTALL) -m 755 -d $(DESTDIR)$(PKG_BIN_DIR) ++ $(LTINSTALL) -m 755 $(LTCOMMAND) $(DESTDIR)$(PKG_BIN_DIR) + install-dev install-lib: +Index: attr-2.4.44/setfattr/Makefile +=================================================================== +--- attr-2.4.44.orig/setfattr/Makefile 2009-07-31 11:02:14.000000000 +0200 ++++ attr-2.4.44/setfattr/Makefile 2009-12-15 17:41:11.000000000 +0100 +@@ -30,6 +30,6 @@ + include $(BUILDRULES) + + install: default +- $(INSTALL) -m 755 -d $(PKG_BIN_DIR) +- $(LTINSTALL) -m 755 $(LTCOMMAND) $(PKG_BIN_DIR) ++ $(INSTALL) -m 755 -d $(DESTDIR)$(PKG_BIN_DIR) ++ $(LTINSTALL) -m 755 $(LTCOMMAND) $(DESTDIR)$(PKG_BIN_DIR) + install-dev install-lib: +Index: attr-2.4.44/man/Makefile +=================================================================== +--- attr-2.4.44.orig/man/Makefile 2009-07-31 11:02:14.000000000 +0200 ++++ attr-2.4.44/man/Makefile 2009-12-15 17:41:11.000000000 +0100 +@@ -21,6 +21,7 @@ + + SUBDIRS = man1 man2 man3 man5 + ++ifeq ($(PKG_DISTRIBUTION), debian) + default : $(SUBDIRS) + + install : $(addsuffix -install,$(SUBDIRS)) +@@ -38,4 +39,9 @@ + %-install-lib: + $(MAKE) -C $* install-lib + ++else ++default: ++install install-dev install-lib: ++endif ++ + include $(BUILDRULES) +Index: attr-2.4.44/include/Makefile +=================================================================== +--- attr-2.4.44.orig/include/Makefile 2009-07-31 11:02:14.000000000 +0200 ++++ attr-2.4.44/include/Makefile 2009-12-15 17:41:11.000000000 +0100 +@@ -33,7 +33,7 @@ + include $(BUILDRULES) + + install-dev: default +- $(INSTALL) -m 755 -d $(PKG_INC_DIR) +- $(INSTALL) -m 644 $(INST_HFILES) $(PKG_INC_DIR) ++ $(INSTALL) -m 755 -d $(DESTDIR)$(PKG_INC_DIR) ++ $(INSTALL) -m 644 $(INST_HFILES) $(DESTDIR)$(PKG_INC_DIR) + + install install-lib: diff --git a/patches/attr-2.4.44/series b/patches/attr-2.4.44/series index 0785744..ba0adef 100644 --- a/patches/attr-2.4.44/series +++ b/patches/attr-2.4.44/series @@ -1,4 +1,3 @@ - - - +attr_2.4.44-1.diff.gz fix-buildsystem.diff + diff --git a/rules/attr.in b/rules/attr.in index 4e4fa56..6bc8d69 100644 --- a/rules/attr.in +++ b/rules/attr.in @@ -11,8 +11,14 @@ menuconfig ATTR http://acl.bestbits.at/ +config ATTR_SHARED + bool + depends on ATTR + prompt "Install shared lib" + config ATTR_GETTEXT bool depends on ATTR + default y prompt "gettext support" diff --git a/rules/attr.make b/rules/attr.make index b78c61c..dcb42ea 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) @@ -42,6 +44,7 @@ $(ATTR_SOURCE): ATTR_PATH := PATH=$(CROSS_PATH) ATTR_ENV := \ $(CROSS_ENV) \ + DESTDIR=$(PKGDIR)/$(ATTR) \ LIBTOOL=$(PTXCONF_SYSROOT_CROSS)/bin/libtool # @@ -49,7 +52,13 @@ ATTR_ENV := \ # ATTR_AUTOCONF := \ $(CROSS_AUTOCONF_USR) \ - --disable-shared + --libexecdir=/usr/lib + +ifdef PTXCONF_ATTR_SHARED +ATTR_AUTOCONF += --enable-shared +else +ATTR_AUTOCONF += --disable-shared +endif ifdef PTXCONF_ATTR_GETTEXT ATTR_AUTOCONF += --enable-gettext @@ -58,6 +67,15 @@ ATTR_AUTOCONF += --disable-gettext endif # ---------------------------------------------------------------------------- +# Install +# ---------------------------------------------------------------------------- + +$(STATEDIR)/attr.install: + @$(call targetinfo) + @$(call install, ATTR) + @$(call touch) + +# ---------------------------------------------------------------------------- # Target-Install # ---------------------------------------------------------------------------- @@ -77,6 +95,12 @@ $(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) -- 1.6.5.6.gb3118
-- ptxdist mailing list ptxdist@pengutronix.de
