diff options
| author | Paul Martin <paul.martin@codethink.co.uk> | 2015-08-06 18:08:01 +0100 |
|---|---|---|
| committer | Paul Martin <paul.martin@codethink.co.uk> | 2015-08-07 14:16:06 +0100 |
| commit | 848c7a2ccfebad53b4e61c17f9ae8f1758cc91c3 (patch) | |
| tree | 6d5bf5518d55104928541033e4278cc3f55217e4 | |
| parent | 72af31f3542430fd2ba95ab20a9d1c1c2a832cf8 (diff) | |
| download | definitions-848c7a2ccfebad53b4e61c17f9ae8f1758cc91c3.tar.gz | |
Move GNU File into core to fix MIPS build
Recent autoconf (and autoconf generated ./configure files) uses
the "file" program to work out what binary format is currently
being produced by the compiler when the architecture is MIPS.
If "file" doesn't exist, or it fails to identify the binary
format, autoconf/configure silently disables the building of
shared libraries, which causes later chunks to fail to build at
link stage due to missing .so files.
Change-Id: Ia98a22d121fc8cb95d36bcb1d3ae2ce44cc6ddf5
| -rw-r--r-- | strata/core.morph | 16 | ||||
| -rw-r--r-- | strata/tools.morph | 6 |
2 files changed, 16 insertions, 6 deletions
diff --git a/strata/core.morph b/strata/core.morph index 1fb541fb..93ac335f 100644 --- a/strata/core.morph +++ b/strata/core.morph @@ -85,6 +85,10 @@ chunks: repo: upstream:libtool-tarball ref: c026ca36e37d2643623a75d0d3e9e451023139f3 unpetrify-ref: libtool-2.4.6 +- name: file + repo: upstream:file + ref: f69c3fd9bcb108292e7887dd889e8b49f68c4a52 + unpetrify-ref: file-5.22 - name: libexpat morph: strata/core/libexpat.morph repo: upstream:libexpat @@ -93,6 +97,7 @@ chunks: build-depends: - autoconf - automake + - file - libtool-tarball - name: gettext-tarball morph: strata/core/gettext-tarball.morph @@ -113,6 +118,7 @@ chunks: unpetrify-ref: baserock/build-essential build-depends: - automake + - file - gettext-tarball - name: openssl-new morph: strata/core/openssl-new.morph @@ -201,6 +207,7 @@ chunks: build-depends: - autoconf - automake + - file - gettext-tarball - libtool-tarball # Note: libtool's version number must be set in libtool's chunk morph, @@ -214,6 +221,7 @@ chunks: build-depends: - autoconf - automake + - file - help2man - patch - texinfo-tarball @@ -225,6 +233,7 @@ chunks: build-depends: - autoconf - automake + - file - cpython - libtool - xz @@ -244,6 +253,7 @@ chunks: build-depends: - autoconf - automake + - file - libtool - openssl-new - ca-certificates @@ -295,7 +305,9 @@ chunks: ref: 4b005410f865895d4dcd56e2c135278a7a315877 unpetrify-ref: baserock/morph build-depends: + - file - autoconf + - automake - gettext-tarball - libtool - name: acl @@ -383,6 +395,7 @@ chunks: - autoconf - libtool - automake + - file - libxml2 - name: gnome-common repo: upstream:gnome-common @@ -398,6 +411,7 @@ chunks: build-depends: - autoconf - automake + - file - cpython - gettext-tarball - libffi @@ -409,6 +423,7 @@ chunks: build-depends: - autoconf - automake + - file - bash - bison - cpython @@ -424,3 +439,4 @@ chunks: build-depends: - pkg-config - util-linux + - file diff --git a/strata/tools.morph b/strata/tools.morph index 4128cad9..e5eb89b0 100644 --- a/strata/tools.morph +++ b/strata/tools.morph @@ -9,10 +9,6 @@ chunks: repo: upstream:distcc ref: c9691a9604fdf9d6711204999787d332b7141692 unpetrify-ref: baserock/morph -- name: file - repo: upstream:file - ref: f69c3fd9bcb108292e7887dd889e8b49f68c4a52 - unpetrify-ref: file-5.22 - name: gdb morph: strata/tools/gdb.morph repo: upstream:binutils-gdb @@ -71,8 +67,6 @@ chunks: repo: upstream:ipmitool ref: be7917f9f58c8a354bc0960ed57516af5d2bd29a unpetrify-ref: IPMITOOL_1_8_14 - build-depends: - - file - name: parted morph: strata/tools/parted.morph repo: upstream:parted |