summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPedro Alvarez <pedro.alvarez@codethink.co.uk>2015-03-03 16:09:25 (GMT)
committerPedro Alvarez <pedro.alvarez@codethink.co.uk>2015-03-05 12:22:16 (GMT)
commitb1fe8c5459e0fc193f656f4a8547c710b8554876 (patch)
tree42223f2ba3252c45c24ee20dfb850ae0fd233dc6
parent8fc1c244dd05e723aac6ef5e5af49b8307a37cf2 (diff)
downloaddefinitions-b1fe8c5459e0fc193f656f4a8547c710b8554876.tar.gz
Upgrade attr version and remove 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'
-rw-r--r--strata/foundation.morph2
-rw-r--r--strata/foundation/attr.morph24
2 files changed, 15 insertions, 11 deletions
diff --git a/strata/foundation.morph b/strata/foundation.morph
index 9a4a15e..d85ed9c 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 59158a9..46d0b9c 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 configure
+- |
+ ./configure --prefix="$PREFIX" \
+ --exec-prefix="$PREFIX" \
+ --sbindir="$PREFIX"/sbin \
+ --bindir="$PREFIX"/bin \
+ --libdir="$PREFIX"/lib \
+ --libexecdir="$PREFIX"/lib \
+ --enable-lib64=yes \
+ --includedir="$PREFIX"/include \
+ --mandir="$PREFIX"/share/man \
+ --datadir="$PREFIX"/share
install-commands:
-- make SHELL=/bin/bash DESTDIR="$DESTDIR" install-lib install-dev
+- make DESTDIR="$DESTDIR" install-lib install-dev