From 062bb62cffea0f010b2d4cd7b462259e4a828e76 Mon Sep 17 00:00:00 2001 From: cronyx Date: Thu, 24 Feb 2022 12:10:04 +0300 Subject: [PATCH] keep libstdc++ if wifibroadcast package is selected --- building.sh | 6 +----- scripts/executing_commands_for_musl.sh | 6 +++++- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/building.sh b/building.sh index e4e180e9..30d9d493 100755 --- a/building.sh +++ b/building.sh @@ -1,6 +1,6 @@ #!/bin/bash # -# OpenIPC.org | v.20220223 +# OpenIPC.org | v.20220224 # MAX_KERNEL_SIZE=0x200000 # 2MiB, 2097152 @@ -8,8 +8,6 @@ MAX_KERNEL_SIZE_EXPERIMENTAL=0x3E8480 # ~3.9MiB, 4097152 MAX_ROOTFS_SIZE=0x500000 # 5MiB, 5242880 MAX_KERNEL_SIZE_ULTIMATE=0xC80000 # 12,5MiB, 13107200 -export REQUIRE_LIBSTDC=0 - clone() { sudo apt-get update -y ; apt-get install -y bc build-essential git unzip rsync autotools-dev automake libtool git clone --depth=1 https://github.com/OpenIPC/firmware.git @@ -135,7 +133,6 @@ gk7205v200() { } gk7205v200_fpv() { - export REQUIRE_LIBSTDC=1 soc="gk7205v200" fresh && make PLATFORM=goke BOARD=unknown_unknown_${soc}_fpv all && rename } @@ -151,7 +148,6 @@ gk7205v300() { } gk7205v300_fpv() { - export REQUIRE_LIBSTDC=1 soc="gk7205v300" fresh && make PLATFORM=goke BOARD=unknown_unknown_${soc}_fpv all && rename } diff --git a/scripts/executing_commands_for_musl.sh b/scripts/executing_commands_for_musl.sh index 31aa852c..6e1ca6c3 100755 --- a/scripts/executing_commands_for_musl.sh +++ b/scripts/executing_commands_for_musl.sh @@ -12,6 +12,10 @@ echo 'Note: BR2_TOOLCHAIN_BUILDROOT_LIBC="musl"' ln -sfv /lib/libc.so ${TARGET_DIR}/lib/ld-uClibc.so.0 ln -sfv ../../lib/libc.so ${TARGET_DIR}/usr/bin/ldd # -if [ $(echo $REQUIRE_LIBSTDC) -eq 0 ]; then + +if grep -q ^BR2_PACKAGE_WIFIBROADCAST=y ${BR2_CONFIG} +then + echo "Keep libsdc++..." +else rm -f ${TARGET_DIR}/usr/lib/libstdc++* fi