diff options
author | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2012-12-27 18:04:01 +0000 |
---|---|---|
committer | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2012-12-27 18:04:01 +0000 |
commit | f39699d14634f0b798ceb1d115d2709e6bd1d8e5 (patch) | |
tree | 5606d1b2bf4a9a56e22ec276435e1b693eac3ae3 | |
parent | 7c8562a44d9462d8c52ddb90603a7c2769b357b0 (diff) | |
download | eglibc2-baserock/morph.tar.gz |
Take the opportunity to tidy up eglibc.morphbaserock/morph
-rwxr-xr-x | eglibc.morph | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/eglibc.morph b/eglibc.morph index a2e3c7442..8ffc95920 100755 --- a/eglibc.morph +++ b/eglibc.morph @@ -4,7 +4,7 @@ "configure-commands": [ "cd libc && ln -s ../ports ports", "mkdir o", - "cd o && CFLAGS=\"-O2 -U_FORTIFY_SOURCE -fno-stack-protector\" ../libc/configure --prefix=/usr --disable-profile --without-selinux --without-cvs --enable-add-ons libc_cv_forced_unwind=yes libc_cv_c_cleanup=yes --enable-kernel=2.6.25 --enable-stackguard-randomization CFLAGS=\"-O2 -U_FORTIFY_SOURCE -fno-stack-protector\" libc_cv_ssp=no" + "cd o && CFLAGS=\"-fno-stack-protector -O2 -U_FORTIFY_SOURCE \" ../libc/configure --prefix=/usr --disable-profile --enable-add-ons --enable-kernel=2.6.25 --enable-stackguard-randomization --without-cvs --without-selinux libc_cv_c_cleanup=yes libc_cv_forced_unwind=yes libc_cv_ssp=no" ], "build-commands": [ "cd o && env user-defined-trusted-dirs=\"/lib:/usr/lib:/lib32:/usr/lib32:/usr/local/lib:/usr/local/lib32:/usr/local/lib64\" make CFLAGS=\"-O2 -U_FORTIFY_SOURCE -fno-stack-protector\"" @@ -13,17 +13,5 @@ "cd o && make install_root=\"$DESTDIR\" install", "rm \"$DESTDIR\"/sbin/sln", "rm \"$DESTDIR\"/etc/ld.so.cache", - "if $BOOTSTRAP; then gcc -dumpspecs | sed -e \"s@$BOOTSTRAP_TOOLS@@g\" -e '/\\*startfile_prefix_spec:/{n;s@.*@/usr/lib/ @}' -e '/\\*cpp:/{n;s@$@ -isystem /usr/include@}' > `dirname $(gcc --print-libgcc-file-name)`/specs; fi" - ], - "chunks": { - "eglibc-runtime": [ - "etc", - "lib64", - "sbin", - "usr/bin" - ], - "eglibc-devel": [ - "." - ] - } + ] } |