From: Carsten Schlote c.schl...@konzeptpark.de
Somehow the build still breaks. Reworked
previous patch and added more fixes.
Now it it builds.
Signed-off-by: Carsten Schlote c.schl...@konzeptpark.de
---
patches/attr-2.4.44/fix-buildsystem-additions.diff | 217
patches/attr-2.4.44/series |5 +-
2 files changed, 219 insertions(+), 3 deletions(-)
create mode 100644 patches/attr-2.4.44/fix-buildsystem-additions.diff
diff --git a/patches/attr-2.4.44/fix-buildsystem-additions.diff
b/patches/attr-2.4.44/fix-buildsystem-additions.diff
new file mode 100644
index 000..cbf1c07
--- /dev/null
+++ b/patches/attr-2.4.44/fix-buildsystem-additions.diff
@@ -0,0 +1,217 @@
+Subject: [patch] attr: make attr DESTDIR aware
+From: Carsten Schlote c.schl...@konzeptpark.de
+
+Additional DESTDIR awareness. DIST_ROOT caused a compile break.
+
+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 | 34 +-
+ man/Makefile|6 ++
+ setfattr/Makefile |4 ++--
+ 8 files changed, 39 insertions(+), 31 deletions(-)
+
+# 20091213 rsc: submitted as https://savannah.nongnu.org/bugs/index.php?28281
+
+
+
+Index: attr-2.4.44/include/buildmacros
+===
+--- attr-2.4.44.orig/include/buildmacros 2010-01-08 16:46:35.0
+0100
attr-2.4.44/include/buildmacros2010-01-08 16:46:46.0 +0100
+@@ -40,7 +40,7 @@
+ $(LFILES:.l=.o) \
+ $(YFILES:%.y=%.tab.o)
+
+-INSTALL = DIST_ROOT=$(DESTDIR) $(TOPDIR)/include/install-sh -o
$(PKG_USER) -g $(PKG_GROUP)
++INSTALL = $(TOPDIR)/include/install-sh -o $(PKG_USER) -g $(PKG_GROUP)
+
+ SHELL = /bin/sh
+ IMAGES_DIR = $(TOPDIR)/all-images
+@@ -57,7 +57,7 @@
+
+ LTLINK = $(LIBTOOL) --tag=CC --mode=link $(CC)
+ LTEXEC = $(LIBTOOL) --mode=execute
+-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)
+ LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CCF)
+
+ ifeq ($(ENABLE_SHARED),yes)
+@@ -68,9 +68,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 +82,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 +98,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 +132,8 @@
+ @for l in
