when enabling DEBUG_BUILD, an assembler failure used to be seen. But this patch was in meta-oe c0ce7599, dating in 2014...
Cannot reproduce the failure anymore with qemuarm. Signed-off-by: Yi Fan Yu <[email protected]> --- ...-option-enable-thread-tls-to-manage-.patch | 63 ------------------- .../recipes-support/syslog-ng/syslog-ng.inc | 5 -- 2 files changed, 68 deletions(-) delete mode 100644 meta-oe/recipes-support/syslog-ng/files/configure.ac-add-option-enable-thread-tls-to-manage-.patch diff --git a/meta-oe/recipes-support/syslog-ng/files/configure.ac-add-option-enable-thread-tls-to-manage-.patch b/meta-oe/recipes-support/syslog-ng/files/configure.ac-add-option-enable-thread-tls-to-manage-.patch deleted file mode 100644 index ff35fb157..000000000 --- a/meta-oe/recipes-support/syslog-ng/files/configure.ac-add-option-enable-thread-tls-to-manage-.patch +++ /dev/null @@ -1,63 +0,0 @@ -From 15a90fd9ac1396015340e599e26d7cd193898fb8 Mon Sep 17 00:00:00 2001 -From: Hongxu Jia <[email protected]> -Date: Tue, 12 Aug 2014 14:26:13 +0800 -Subject: [PATCH] configure.ac: add option --enable-thread-tls to manage thread - ssl support -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -The thread local storage caused arm-gcc broken while compiling │ -syslog-ng with option '-g -O'. │ -... │ -dnscache.s: Assembler messages: │ -dnscache.s:100: Error: invalid operands (.text and *UND* sections) for `-' │ -... │ - │ -Add option --enable-thread-tls to manage the including of thread -local storage, so we could explicitly disable it. - -Signed-off-by: Hongxu Jia <[email protected]> - -change default to 'yes' -Upstream-Status: Submitted [https://github.com/syslog-ng/syslog-ng/pull/3649] - -Signed-off-by: Yi Fan Yu <[email protected]> ---- - configure.ac | 16 ++++++++++------ - 1 file changed, 10 insertions(+), 6 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 1d67e81..7aad75f 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -210,6 +210,8 @@ AC_ARG_WITH(sanitizer, - [ --with-sanitizer=[address/undefined/etc...] - Enables compiler sanitizer supports (default: no)] - ,,with_sanitizer="no") -+AC_ARG_ENABLE(thread-tls, -+ [ --enable-thread-tls Enable Thread Local Storage support (default: yes)],,enable_thread_tls="yes") - - AC_ARG_ENABLE(dynamic-linking, - [ --enable-dynamic-linking Link everything dynamically.],,enable_dynamic_linking="auto") -@@ -628,12 +630,14 @@ dnl *************************************************************************** - dnl Is the __thread keyword available? - dnl *************************************************************************** - --AC_LINK_IFELSE([AC_LANG_PROGRAM( --[[#include <pthread.h> --__thread int a; --]], --[a=0;])], --[ac_cv_have_tls=yes; AC_DEFINE_UNQUOTED(HAVE_THREAD_KEYWORD, 1, "Whether Thread Local Storage is supported by the system")]) -+if test "x$enable_thread_tls" = "xyes"; then -+ AC_LINK_IFELSE([AC_LANG_PROGRAM( -+ [[#include <pthread.h> -+ __thread int a; -+ ]], -+ [a=0;])], -+ [ac_cv_have_tls=yes; AC_DEFINE_UNQUOTED(HAVE_THREAD_KEYWORD, 1, "Whether Thread Local Storage is supported by the system")]) -+fi - - dnl *************************************************************************** - dnl How to do static linking? diff --git a/meta-oe/recipes-support/syslog-ng/syslog-ng.inc b/meta-oe/recipes-support/syslog-ng/syslog-ng.inc index ebb3eaf0f..e48e5d5e2 100644 --- a/meta-oe/recipes-support/syslog-ng/syslog-ng.inc +++ b/meta-oe/recipes-support/syslog-ng/syslog-ng.inc @@ -22,7 +22,6 @@ SRC_URI = "https://github.com/balabit/syslog-ng/releases/download/${BP}/${BP}.ta file://syslog-ng.conf.sysvinit \ file://initscript \ file://volatiles.03_syslog-ng \ - file://configure.ac-add-option-enable-thread-tls-to-manage-.patch \ " UPSTREAM_CHECK_URI = "https://github.com/balabit/syslog-ng/releases"; @@ -42,12 +41,8 @@ EXTRA_OECONF = " \ --disable-python \ --disable-java --disable-java-modules \ --with-pidfile-dir=${localstatedir}/run/${BPN} \ - ${CONFIG_TLS} \ " -CONFIG_TLS = "--enable-thread-tls" -CONFIG_TLS_arm = "${@oe.utils.conditional( "DEBUG_BUILD", "1", " --disable-thread-tls", " --enable-thread-tls", d )}" - PACKAGECONFIG ??= " \ ${@bb.utils.filter('DISTRO_FEATURES', 'ipv6 systemd', d)} \ " -- 2.29.2
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#90850): https://lists.openembedded.org/g/openembedded-devel/message/90850 Mute This Topic: https://lists.openembedded.org/mt/82145037/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
