[attr] rework DESTDIR support

The DESTDIR support has been removed, as it doesn't work if trying to
install shared libs. The buildsystem supports DIST_ROOT instead.

So we add the appropriate DIST_ROOT to ATTR_INSTALL_OPT.

We no longer have to use an external LIBTOOL, a working libtool comes
with the package.

Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>

5 files changed, 39 insertions, 48 deletions

diff --git a/patches/attr-2.4.44/0001-attr-make-attr-DESTDIR-aware.patch b/patches/attr-2.4.44/0001-attr-make-attr-DESTDIR-aware.patch
new file mode 100644
index 000000000..7eb986d22
--- /dev/null
+++ b/patches/attr-2.4.44/0001-attr-make-attr-DESTDIR-aware.patch
@@ -0,0 +1,32 @@
+From ab16f079fc3c0014da5c7455d47eda24dad192c4 Mon Sep 17 00:00:00 2001
+From: Robert Schwebel <r.schwebel@pengutronix.de>
+Date: Fri, 8 Jan 2010 17:22:45 +0100
+Subject: [PATCH] buildmacros: use correct libtool commands
+
+Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
+[mkl: remove broken DESTDIR support]
+Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
+---
+ include/buildmacros |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/include/buildmacros b/include/buildmacros
+index ab89182..71ce471 100644
+--- a/include/buildmacros
++++ b/include/buildmacros
+@@ -55,10 +55,10 @@ LIBNAME = $(basename $(LTLIBRARY))
+ LTOBJECTS = $(OBJECTS:.o=.lo)
+ LTVERSION = $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
+ 
+-LTLINK = $(LIBTOOL) --mode=link $(CC)
++LTLINK = $(LIBTOOL) --tag=CC --mode=link $(CC)
+ LTEXEC = $(LIBTOOL) --mode=execute
+ LTINSTALL = $(LIBTOOL) --mode=install $(INSTALL)
+-LTCOMPILE = $(LIBTOOL) --mode=compile $(CCF)
++LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CCF)
+ 
+ ifeq ($(ENABLE_SHARED),yes)
+ LTLDFLAGS += -rpath $(PKG_LIB_DIR)
+-- 
+1.6.5.7
+
diff --git a/patches/attr-2.4.44/fix-buildsystem.diff b/patches/attr-2.4.44/fix-buildsystem.diff
deleted file mode 100644
index 7027061bc..000000000
--- a/patches/attr-2.4.44/fix-buildsystem.diff
+++ /dev/null
@@ -1,40 +0,0 @@
-Subject: [patch] attr: make attr DESTDIR aware
-From: Robert Schwebel <r.schwebel@pengutronix.de>
-
-Make DESTDIR aware and use correct libtool commands.
-
-Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
-
----
-# 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
-===================================================================
---- 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))
- LTOBJECTS = $(OBJECTS:.o=.lo)
- LTVERSION = $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
- 
--LTLINK = $(LIBTOOL) --mode=link $(CC)
-+LTLINK = $(LIBTOOL) --tag=CC --mode=link $(CC)
- 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)
-+LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CCF)
- 
- ifeq ($(ENABLE_SHARED),yes)
- LTLDFLAGS += -rpath $(PKG_LIB_DIR)
diff --git a/patches/attr-2.4.44/series b/patches/attr-2.4.44/series
index 0785744ef..5e93a0763 100644
--- a/patches/attr-2.4.44/series
+++ b/patches/attr-2.4.44/series
@@ -1,4 +1 @@
-
-
-
-fix-buildsystem.diff
+0001-attr-make-attr-DESTDIR-aware.patch
diff --git a/rules/attr.in b/rules/attr.in
index 4e4fa56d6..16f6663a4 100644
--- a/rules/attr.in
+++ b/rules/attr.in
@@ -1,7 +1,7 @@
 ## SECTION=disk_and_file
+
 menuconfig ATTR
 	tristate
-	select CROSS_LIBTOOL
 	select HOST_GETTEXT if ATTR_GETTEXT
 	prompt "attr                          "
 	help
diff --git a/rules/attr.make b/rules/attr.make
index b78c61cde..e1daf5f97 100644
--- a/rules/attr.make
+++ b/rules/attr.make
@@ -40,9 +40,11 @@ $(ATTR_SOURCE):
 # ----------------------------------------------------------------------------
 
 ATTR_PATH	:= PATH=$(CROSS_PATH)
-ATTR_ENV 	:= \
-	$(CROSS_ENV) \
-	LIBTOOL=$(PTXCONF_SYSROOT_CROSS)/bin/libtool
+ATTR_ENV 	:= $(CROSS_ENV) \
+
+ATTR_INSTALL_OPT := \
+	DIST_ROOT=$(ATTR_PKGDIR) \
+	install
 
 #
 # autoconf