From 68c602b8cb3586f0a683c91482cb4261a3c5a141 Mon Sep 17 00:00:00 2001 From: Marko Semet Date: Sat, 31 Aug 2019 21:35:11 +0200 Subject: [PATCH] Support shared and order configures in base platform --- BasePlatform/v1/sdk/cross.yaml | 89 +++++++++++++++++++--------------- 1 file changed, 49 insertions(+), 40 deletions(-) diff --git a/BasePlatform/v1/sdk/cross.yaml b/BasePlatform/v1/sdk/cross.yaml index e03414a..3d75450 100644 --- a/BasePlatform/v1/sdk/cross.yaml +++ b/BasePlatform/v1/sdk/cross.yaml @@ -16,16 +16,16 @@ modules: - --target=x86_64-unknown-linux - --disable-nls - --disable-werror - - --enable-multilib - - --enable-multiarch - - --enable-plugins - - --enable-gold - - --enable-lto - - --enable-static-pie - --enable-64-bit-bfd - - --enable-targets=x86_64-pep - - --enable-shared + - --enable-gold - --enable-ld=default + - --enable-lto + - --enable-multiarch + - --enable-multilib + - --enable-plugins + - --enable-shared + - --enable-static-pie + - --enable-targets=x86_64-pep - --with-system-zlib - --with-lib-path=/usr/tools/lib:/usr/target/lib32:/usr/lib:/usr/lib32:/usr/lib/x86_64-linux-gnu:/usr/lib64:/app/lib:/app/lib32:/app/lib64 build-options: @@ -63,20 +63,22 @@ modules: - --with-glibc-version=2.18 - --with-newlib - --without-headers - - --disable-nls - - --disable-shared + - --disable-bootstrap - --disable-decimal-float - - --disable-threads - --disable-libatomic - - --disable-libgomp - --disable-libmpx + - --disable-libgomp - --disable-libquadmath + - --disable-libstdcxx - --disable-libssp - --disable-libvtv - - --disable-libstdcxx - - --disable-bootstrap - - --enable-multilib + - --disable-nls + - --disable-shared + - --disable-threads + - --enable-default-pie + - --enable-default-ssp - --enable-languages=c,c++ + - --enable-multilib builddir: true cleanup: - "*" @@ -108,8 +110,8 @@ modules: - --enable-bind-now - --enable-cet - --enable-multi-arch - - --enable-stackguard-randomization - --enable-stack-protector=strong + - --enable-stackguard-randomization - --with-headers=/usr/include - --libdir=/usr/lib - --libexecdir=/usr/lib @@ -150,8 +152,8 @@ modules: - --enable-bind-now - --enable-cet - --enable-multi-arch - - --enable-stackguard-randomization - --enable-stack-protector=strong + - --enable-stackguard-randomization - --with-headers=/usr/include - --libdir=/usr/lib32 - --libexecdir=/usr/lib32 @@ -185,9 +187,13 @@ modules: - cd build; ../libstdc++-v3/configure --enable-multilib --with-headers=/usr/include - --disable-nls --prefix=/usr + --disable-nls --disable-werror + --enable-default-pie + --enable-default-ssp + --enable-shared + --enable-static "CC=/usr/bin/ccache /usr/tools_gcc/usr/bin/gcc" "CXX=/usr/bin/ccache /usr/tools_gcc/usr/bin/g++" - cd build; make -j$FLATPAK_BUILDER_N_JOBS @@ -221,15 +227,18 @@ modules: - rm -rv /usr/tools_gcc/usr/include; ln -sv /usr/include /usr/tools_gcc/usr/include - sed -e '/m64=/s/lib64/lib/' -i.orig gcc/config/i386/t-linux64 config-opts: - - --with-glibc-version=2.18 - - --disable-nls - - --disable-shared - - --disable-bootstrap - - --enable-multilib - - --enable-languages=c,c++ - --host=x86_64-unknown-linux - --build=x86_64-unknown-linux - --target=x86_64-unknown-linux + - --with-glibc-version=2.18 + - --disable-bootstrap + - --disable-nls + - --enable-multilib + - --enable-default-pie + - --enable-default-ssp + - --enable-languages=c,c++ + - --enable-shared + - --enable-static - CC=/usr/bin/ccache /usr/tools_gcc/usr/bin/gcc - CPP=/usr/bin/ccache /usr/tools_gcc/usr/bin/g++ build-options: @@ -264,22 +273,22 @@ modules: - sed -e '/m64=/s/lib64/lib/' -i.orig gcc/config/i386/t-linux64 config-opts: - --with-glibc-version=2.18 - - --disable-nls - - --disable-shared - --disable-bootstrap - - --enable-multilib - - --enable-languages=c,c++,lto + - --disable-nls - --host=x86_64-unknown-linux - --build=x86_64-unknown-linux - --target=x86_64-unknown-linux - - --enable-gnu-unique-object - - --enable-linker-build-id - - --enable-lto - - --enable-plugin - - --enable-gnu-indirect-function + - --enable-cet=auto - --enable-default-pie - --enable-default-ssp - - --enable-cet=auto + - --enable-gnu-indirect-function + - --enable-languages=c,c++,lto + - --enable-linker-build-id + - --enable-lto + - --enable-multilib + - --enable-plugin + - --enable-shared + - --enable-static - CC=/usr/bin/ccache /usr/tools_gcc2/usr/bin/gcc - CPP=/usr/bin/ccache /usr/tools_gcc2/usr/bin/g++ build-options: @@ -305,16 +314,16 @@ modules: config-opts: - --disable-nls - --disable-werror + - --enable-64-bit-bfd + - --enable-deterministic-archives + - --enable-gold + - --enable-lto - --enable-multilib - --enable-multiarch - --enable-plugins - - --enable-gold - - --enable-lto - - --enable-static-pie - - --enable-64-bit-bfd - - --enable-targets=x86_64-pep - - --enable-deterministic-archives - --enable-relro + - --enable-static-pie + - --enable-targets=x86_64-pep - --enable-threads - --with-lib-path=/usr/lib:/usr/lib32:/usr/lib/x86_64-linux-gnu:/usr/lib64:/app/lib:/app/lib32:/app/lib64 build-options: