From 1a8f0701e15a97c963890bf35aefd21b659c5694 Mon Sep 17 00:00:00 2001
From: Pedro Alvarez <pedro.alvarez@codethink.co.uk>
Date: Tue, 3 Mar 2015 16:09:25 +0000
Subject: Upgrade attr version and fix DESTDIR hack

This chunk was installing things in $DESTDIR$DESTDIR. For some reason
when creating the artifact morph ignores this error and creates the
artifact successfully, but some paths in files installed by attr were
wrong because they were including $DESTDIR on it:

  # grep attr.inst /usr/lib*/libattr.la
  libdir='/attr.inst/usr/lib64'
---
 strata/foundation.morph      |  2 +-
 strata/foundation/attr.morph | 22 +++++++++++++---------
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/strata/foundation.morph b/strata/foundation.morph
index 9a4a15ec..d85ed9c4 100644
--- a/strata/foundation.morph
+++ b/strata/foundation.morph
@@ -7,7 +7,7 @@ chunks:
 - name: attr
   morph: strata/foundation/attr.morph
   repo: upstream:attr
-  ref: bf32f1769e9895f8546570f0c841a945c93a5b22
+  ref: 4b005410f865895d4dcd56e2c135278a7a315877
   unpetrify-ref: baserock/morph
   build-depends: []
 - name: groff
diff --git a/strata/foundation/attr.morph b/strata/foundation/attr.morph
index 59158a90..ce0f1dff 100644
--- a/strata/foundation/attr.morph
+++ b/strata/foundation/attr.morph
@@ -1,14 +1,18 @@
 name: attr
 kind: chunk
-description:
-- 'The DESTDIR patch idea comes from: http://pkgs.fedoraproject.org/gitweb/?p=attr.git;a=blob_plain;f=attr-2.4.32-build.patch'
+build-system: autotools
 configure-commands:
-- sed -i -e 's,PKG_\(.*\)_DIR\t= ,PKG_\1_DIR\t= \$(DESTDIR),g' include/builddefs.in
 - sed -i -e 's,\$\$LOCAL_CONFIGURE_OPTIONS,\$(LOCAL_CONFIGURE_OPTIONS),g' Makefile
-- make LOCAL_CONFIGURE_OPTIONS="--prefix=/usr --exec-prefix=/usr --sbindir=/usr/sbin
-  --bindir=/usr/bin --libdir=/usr/lib --libexecdir=/usr/lib --enable-lib64=yes --includedir=/usr/include
-  --mandir=/usr/share/man --datadir=/usr/share" configure
-build-commands:
-- make SHELL=/bin/bash
+- |
+  make LOCAL_CONFIGURE_OPTIONS="--prefix=/usr \
+                                --exec-prefix=/usr \
+                                --sbindir=/usr/sbin \
+                                --bindir=/usr/bin \
+                                --libdir=/usr/lib \
+                                --libexecdir=/usr/lib \
+                                --enable-lib64=yes \
+                                --includedir=/usr/include \
+                                --mandir=/usr/share/man \
+                                --datadir=/usr/share" configure
 install-commands:
-- make SHELL=/bin/bash DESTDIR="$DESTDIR" install-lib install-dev
+- make DESTDIR="$DESTDIR" install-lib install-dev
-- 
cgit v1.2.1