mirror of
https://gitlab.com/buildroot.org/buildroot.git
synced 2026-09-10 00:04:06 -09:00
package/libdex: fix build without SSP
Fix the following build failure without stack-protector raised since the addition of the package in commit70319b47f6: /home/buildroot/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/i686-buildroot-linux-uclibc/9.3.0/../../../../i686-buildroot-linux-uclibc/bin/ld: src/libdex-1.a.p/dex-async-pair.c.o: in function `dex_async_pair_ready_callback': dex-async-pair.c:(.text+0x118): undefined reference to `__stack_chk_guard' Fixes:70319b47f6- http://autobuild.buildroot.org/results/f53768f654a9eddd95b583a366cd7386d9ddb285 Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
This commit is contained in:
committed by
Thomas Petazzoni
parent
b68fa4c31a
commit
482a27a7be
45
package/libdex/0001-add-stack-protector-option.patch
Normal file
45
package/libdex/0001-add-stack-protector-option.patch
Normal file
@@ -0,0 +1,45 @@
|
||||
From 107efb2f1a014c4475e122677faddbe0dbef1000 Mon Sep 17 00:00:00 2001
|
||||
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
Date: Tue, 23 Jul 2024 14:54:59 +0200
|
||||
Subject: [PATCH] add stack-protector option
|
||||
|
||||
Allow the user to disable stack-protector as it is not supported by all
|
||||
toolchains
|
||||
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
Upstream: https://gitlab.gnome.org/GNOME/libdex/-/commit/a65d33aebbe43024a046b3f3cc4a1c6c533838d0
|
||||
---
|
||||
meson.build | 2 +-
|
||||
meson_options.txt | 3 +++
|
||||
2 files changed, 4 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/meson.build b/meson.build
|
||||
index d0ca81d..2f7aac2 100644
|
||||
--- a/meson.build
|
||||
+++ b/meson.build
|
||||
@@ -126,7 +126,7 @@ test_c_args = [
|
||||
['-Werror=format-security', '-Werror=format=2'],
|
||||
'-FImsvc_recommended_pragmas.h',
|
||||
]
|
||||
-if get_option('buildtype') != 'plain'
|
||||
+if get_option('buildtype') != 'plain' and get_option('stack-protector')
|
||||
if host_machine.system() != 'windows'
|
||||
test_c_args += '-fstack-protector-strong'
|
||||
endif
|
||||
diff --git a/meson_options.txt b/meson_options.txt
|
||||
index 519cd97..9e3364a 100644
|
||||
--- a/meson_options.txt
|
||||
+++ b/meson_options.txt
|
||||
@@ -4,6 +4,9 @@ option('docs',
|
||||
option('examples',
|
||||
type: 'boolean', value: true,
|
||||
description: 'Build example programs')
|
||||
+option('stack-protector',
|
||||
+ type: 'boolean', value: true,
|
||||
+ description: 'Enable stack-protector')
|
||||
option('vapi',
|
||||
type: 'boolean', value: true,
|
||||
description: 'Generate vapi data (requires vapigen)')
|
||||
--
|
||||
GitLab
|
||||
|
||||
@@ -15,6 +15,7 @@ LIBDEX_DEPENDENCIES = libglib2
|
||||
LIBDEX_CONF_OPTS = \
|
||||
-Ddocs=false \
|
||||
-Dexamples=false \
|
||||
-Dstack-protector=false \
|
||||
-Dsysprof=false \
|
||||
-Dtests=false \
|
||||
-Dvapi=false \
|
||||
|
||||
Reference in New Issue
Block a user