a0871be6c0
* Update buildroot-patches for 2020.11-rc1 buildroot * Update buildroot to 2020.11-rc1 Signed-off-by: Stefan Agner <stefan@agner.ch> * Don't rely on sfdisk --list-free output The --list-free (-F) argument does not allow machine readable mode. And it seems that the output format changes over time (different spacing, using size postfixes instead of raw blocks). Use sfdisk json output and calculate free partition space ourselfs. This works for 2.35 and 2.36 and is more robust since we rely on output which is meant for scripts to parse. * Migrate defconfigs for Buildroot 2020.11-rc1 In particular, rename BR2_TARGET_UBOOT_BOOT_SCRIPT(_SOURCE) to BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT(_SOURCE). * Rebase/remove systemd patches for systemd 246 * Drop apparmor/libapparmor from buildroot-external * hassos-persists: use /run as directory for lockfiles The U-Boot tools use /var/lock by default which is not created any more by systemd by default (it is under tmpfiles legacy.conf, which we no longer install). * Disable systemd-update-done.service The service is not suited for pure read-only systems. In particular the service needs to be able to write a file in /etc and /var. Remove the service. Note: This is a static service and cannot be removed using systemd-preset. * Disable apparmor.service for now The service loads all default profiles. Some might actually cause problems. E.g. the profile for ping seems not to match our setup for /etc/resolv.conf: [85503.634653] audit: type=1400 audit(1605286002.684:236): apparmor="DENIED" operation="open" profile="ping" name="/run/resolv.conf" pid=27585 comm="ping" requested_mask="r" denied_mask="r" fsuid=0 ouid=0
52 lines
1.9 KiB
Diff
52 lines
1.9 KiB
Diff
From 7ae73da23ad998bd1e63ad213cf7a02e61191951 Mon Sep 17 00:00:00 2001
|
||
From: Romain Naour <romain.naour@gmail.com>
|
||
Date: Sat, 23 May 2020 19:01:19 +0200
|
||
Subject: [PATCH] gn.pro: don't link statically with libstc++
|
||
MIME-Version: 1.0
|
||
Content-Type: text/plain; charset=UTF-8
|
||
Content-Transfer-Encoding: 8bit
|
||
|
||
While cross-compiling, qt5webengine is building a host tool but
|
||
want to link the libstdc++ statically. This requires to install
|
||
libstdc++-static package on the host (Fedora package name).
|
||
|
||
Otherwise the link fail with:
|
||
|
||
[185/185] LINK gn
|
||
FAILED: gn
|
||
/usr/bin/g++ -O3 -fdata-sections -ffunction-sections -Wl,--gc-sections -Wl,-strip-all -Wl,--as-needed -static-libstdc++ -pthread -o gn -Wl,--start-group tools/gn/gn_main.o base.a gn_lib.a -Wl,--end-group -ldl
|
||
/usr/bin/ld : unable to find -lstdc++
|
||
[...]
|
||
Project ERROR: GN build error!
|
||
|
||
Add --no-static-libstdc++ argument to gn.pro to link to
|
||
libstdc++.so.6 instead of libstdc++.a.
|
||
|
||
--no-static-libstdc++ has been added by [1] but it force
|
||
linking statically by default.
|
||
|
||
[1] https://github.com/qt/qtwebengine-chromium/commit/cfab9198a9917f42cf08b1caf84ab9b71aac1911#diff-905c8f054808213577c0a92d1b704615
|
||
|
||
Signed-off-by: Romain Naour <romain.naour@gmail.com>
|
||
---
|
||
src/buildtools/gn.pro | 3 ++-
|
||
1 file changed, 2 insertions(+), 1 deletion(-)
|
||
|
||
diff --git a/src/buildtools/gn.pro b/src/buildtools/gn.pro
|
||
index 033202e6..5dd8e241 100644
|
||
--- a/src/buildtools/gn.pro
|
||
+++ b/src/buildtools/gn.pro
|
||
@@ -20,7 +20,8 @@ build_pass|!debug_and_release {
|
||
|
||
gn_gen_args = --no-last-commit-position --out-path $$out_path \
|
||
--cc \"$$which($$QMAKE_CC)\" --cxx \"$$which($$QMAKE_CXX)\" \
|
||
- --ld \"$$which($$QMAKE_LINK)\"
|
||
+ --ld \"$$which($$QMAKE_LINK)\" \
|
||
+ --no-static-libstdc++
|
||
|
||
msvc:!clang_cl: gn_gen_args += --use-lto
|
||
|
||
--
|
||
2.25.4
|
||
|