diff options
author | Pedro Alvarez <pedro.alvarez@codethink.co.uk> | 2015-03-05 12:22:25 +0000 |
---|---|---|
committer | Pedro Alvarez <pedro.alvarez@codethink.co.uk> | 2015-03-05 12:22:25 +0000 |
commit | c85678db412a710a4ee339cebd3664028eee8429 (patch) | |
tree | 42223f2ba3252c45c24ee20dfb850ae0fd233dc6 | |
parent | a73f81a952a098b8671b3f48e2f8cb0eecd39622 (diff) | |
parent | b1fe8c5459e0fc193f656f4a8547c710b8554876 (diff) | |
download | definitions-c85678db412a710a4ee339cebd3664028eee8429.tar.gz |
Merge branch 'baserock/pedroalvarez/attr-common-api-fixes'
Reviewed-by: Sam Thursfield <sam.thursfield@codethink.co.uk>
Reviewed-by: Francisco Redondo Marchena <francisco.marchena@codethink.co.uk>
-rw-r--r-- | strata/foundation.morph | 2 | ||||
-rw-r--r-- | strata/foundation/attr.morph | 24 | ||||
-rw-r--r-- | strata/genivi.morph | 2 | ||||
-rw-r--r-- | strata/genivi/genivi-common-api-dbus-runtime.morph | 5 | ||||
-rw-r--r-- | strata/genivi/genivi-common-api-runtime.morph | 5 |
5 files changed, 27 insertions, 11 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..46d0b9c0 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 diff --git a/strata/genivi.morph b/strata/genivi.morph index 24050b4c..c8fe1532 100644 --- a/strata/genivi.morph +++ b/strata/genivi.morph @@ -36,11 +36,13 @@ chunks: build-depends: - googletest - name: genivi-common-api-runtime + morph: strata/genivi/genivi-common-api-runtime.morph repo: upstream:genivi-common-api-runtime ref: 188abb5e24d6a2a7fdd7e5d150439a162621292c unpetrify-ref: 2.1.6 build-depends: [] - name: genivi-common-api-dbus-runtime + morph: strata/genivi/genivi-common-api-dbus-runtime.morph repo: upstream:genivi-common-api-dbus-runtime ref: 3372155b32a2cf3b05e1a2a13f6f8413069de33f unpetrify-ref: 2.1.6-p1 diff --git a/strata/genivi/genivi-common-api-dbus-runtime.morph b/strata/genivi/genivi-common-api-dbus-runtime.morph new file mode 100644 index 00000000..8d6cb134 --- /dev/null +++ b/strata/genivi/genivi-common-api-dbus-runtime.morph @@ -0,0 +1,5 @@ +name: genivi-common-api-dbus-runtime +kind: chunk +build-system: autotools +pre-configure-commands: +- ln -s . build-aux diff --git a/strata/genivi/genivi-common-api-runtime.morph b/strata/genivi/genivi-common-api-runtime.morph new file mode 100644 index 00000000..7439331a --- /dev/null +++ b/strata/genivi/genivi-common-api-runtime.morph @@ -0,0 +1,5 @@ +name: genivi-common-api-runtime +kind: chunk +build-system: autotools +pre-configure-commands: +- ln -s . build-aux |