diff options
author | Pedro Alvarez <pedro.alvarez@codethink.co.uk> | 2015-03-03 16:09:25 +0000 |
---|---|---|
committer | Pedro Alvarez <pedro.alvarez@codethink.co.uk> | 2015-03-04 17:59:49 +0000 |
commit | 1a8f0701e15a97c963890bf35aefd21b659c5694 (patch) | |
tree | 72f1d39d0225a77db8d6c37a14f46f253cae4095 | |
parent | f7f66decf608c953e97e2fdde68f17fed8fc6924 (diff) | |
download | definitions-baserock/pedroalvarez/attr-common-api-fixes.tar.gz |
Upgrade attr version and fix DESTDIR hackbaserock/pedroalvarez/attr-common-api-fixes
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.morph | 2 | ||||
-rw-r--r-- | 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 |