diff options
| author | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2013-03-14 10:59:46 +0000 |
|---|---|---|
| committer | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2013-03-14 10:59:46 +0000 |
| commit | 89bf6cbc637149d7e0ee16d1ebea215fef65c077 (patch) | |
| tree | 33b4ad242cb98ebdc7ddab6aa0dbd7d94c8d1b95 | |
| parent | d515f6a3e32426be6e355c005fb60987b94f2ea3 (diff) | |
| download | binutils-redhat-89bf6cbc637149d7e0ee16d1ebea215fef65c077.tar.gz | |
Add zlib to build-essential
It's never good to have multiple versions of the same library in use
on a system, so we should avoid using the versions of ZLib that are
bundled in the GCC and Binutils releases.
| -rw-r--r-- | binutils.morph | 2 | ||||
| -rw-r--r-- | binutils.morph.yaml | 4 | ||||
| -rw-r--r-- | stage2-binutils.morph | 2 | ||||
| -rw-r--r-- | stage2-binutils.morph.yaml | 2 |
4 files changed, 6 insertions, 4 deletions
diff --git a/binutils.morph b/binutils.morph index 5ccfb574d4..aada71101a 100644 --- a/binutils.morph +++ b/binutils.morph @@ -3,6 +3,6 @@ "kind": "chunk", "build-system": "autotools", "configure-commands": [ - "./configure --prefix=\"$PREFIX\" --disable-nls --disable-werror" + "./configure --prefix=\"$PREFIX\" --disable-nls --disable-werror \\\n --with-system-zlib\n" ] } diff --git a/binutils.morph.yaml b/binutils.morph.yaml index 4549700e60..95b6a780ce 100644 --- a/binutils.morph.yaml +++ b/binutils.morph.yaml @@ -3,4 +3,6 @@ kind: chunk build-system: autotools configure-commands: - - ./configure --prefix="$PREFIX" --disable-nls --disable-werror + - | + ./configure --prefix="$PREFIX" --disable-nls --disable-werror \ + --with-system-zlib diff --git a/stage2-binutils.morph b/stage2-binutils.morph index 32351e1787..42532c21c2 100644 --- a/stage2-binutils.morph +++ b/stage2-binutils.morph @@ -4,7 +4,7 @@ "build-system": "autotools", "configure-commands": [ "stage2-eglibc-fix-specs", - "export STAGE2_SYSROOT=\"$(dirname $(pwd))\"\nexport CPPFLAGS=\"--sysroot=$STAGE2_SYSROOT\"\nexport CXX=false\nexport LDFLAGS=\"-Wl,--sysroot=$STAGE2_SYSROOT\"\n./configure --prefix=\"$PREFIX\" --disable-nls --disable-werror \\\n --build=$BUILD --host=$TARGET_STAGE1 --target=$TARGET_STAGE1 \\\n --with-lib-path=\"$PREFIX/lib\"\n" + "export STAGE2_SYSROOT=\"$(dirname $(pwd))\"\nexport CPPFLAGS=\"--sysroot=$STAGE2_SYSROOT\"\nexport CXX=false\nexport LDFLAGS=\"-Wl,--sysroot=$STAGE2_SYSROOT\"\n./configure --prefix=\"$PREFIX\" --disable-nls --disable-werror \\\n --build=$BUILD --host=$TARGET_STAGE1 --target=$TARGET_STAGE1 \\\n --with-lib-path=\"$PREFIX/lib --with-system-zlib\"\n" ], "build-commands": [ "export STAGE2_SYSROOT=\"$(dirname $(pwd))\"\nexport CPPFLAGS=\"--sysroot=$STAGE2_SYSROOT\"\nexport LDFLAGS=\"-Wl,--sysroot=$STAGE2_SYSROOT\"\nmake\n" diff --git a/stage2-binutils.morph.yaml b/stage2-binutils.morph.yaml index f0d8809875..588a487b78 100644 --- a/stage2-binutils.morph.yaml +++ b/stage2-binutils.morph.yaml @@ -12,7 +12,7 @@ configure-commands: export LDFLAGS="-Wl,--sysroot=$STAGE2_SYSROOT" ./configure --prefix="$PREFIX" --disable-nls --disable-werror \ --build=$BUILD --host=$TARGET_STAGE1 --target=$TARGET_STAGE1 \ - --with-lib-path="$PREFIX/lib" + --with-lib-path="$PREFIX/lib --with-system-zlib" build-commands: # Nested configure scripts require that we set CPPFLAGS here as well |