From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wr0-f194.google.com (mail-wr0-f194.google.com [209.85.128.194]) by mail.openembedded.org (Postfix) with ESMTP id 536C674F2F for ; Wed, 9 May 2018 15:49:42 +0000 (UTC) Received: by mail-wr0-f194.google.com with SMTP id i14-v6so32904412wre.2 for ; Wed, 09 May 2018 08:49:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=Dr1tlEng/T43M8lcZV6OmYO/HnY34MXvhBajs7mEy+o=; b=YcOTGtzJ4ymrwh3Qmd4Y+QIruEcudoC59S8XZYfiOnULeh4CjnZltfzcZAFozRXGkt S3fszbf8aapqYq+GbaH8t4bGpzoZndNT8AHMUIs4CqtkE/mH3W8QV/lqZhmlHGY25AVu 7EfhVyRq9fhQEj3JItzeWt1Byfsb8XIXdWoGQA7iLqC89DgtrScDxuWhbb2k9BEXn7tA oNjg/LAM86X1n6Ls6ZyFB14DTvyqOvwYClchH4oHsK17qbvgBslNXE5pD/qKlgdLNCwZ sFskMtdj0LiH6CCjnlX+xgTGRsKpRhrAtZvW4hml87K/9p0z+5gKWt8ERLCl8jVCgRGR Nj7A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Dr1tlEng/T43M8lcZV6OmYO/HnY34MXvhBajs7mEy+o=; b=CGh1FVnZRE2HacAkmJrzR+bbbllZo7bq5NPJylOZKBROHYhSRJP9o584kdorae+CPC XZC9YW8lPgoIQxte5eVEEz8jmBpDIPtq+Y8bSAZwwAQ1C40HG5M2lK+jnPS95rVxkm4Z zZBGEj1saEyyo4yEeOc9NDFOwc+cWEJfT3JMeskYiy0hAluqKozwsNcxEHCAAgXM2CZV IgP+IAZ5GQmFg9oSR5hqN/IHAhbJCU/ikejXYqsaF+RW8JCImC01G8WhtamJqVBE2DJw OQ4GYjK9NyeKRQHWjG+58GuH7c6PXA5PNj0K5ozj5v/Ud67J7ncgjY3Nsblu1zgoOuZi bFqw== X-Gm-Message-State: ALQs6tDHbcyHzHsdSs2w6NrS8ByjLZPvA6b7dM3lT1YOtdgkhwQVS+FV B2XXJzWWGxs4kYMl4lfv9Xx79Oh6 X-Google-Smtp-Source: AB8JxZpTabvm6ShegP7kvPrgQDMYdACurYW6v5qIxrPZsjbrG/3aJ7ZvhBYdxFmwLZHD89lEczNutQ== X-Received: by 2002:adf:86ed:: with SMTP id 42-v6mr39502608wry.158.1525880983232; Wed, 09 May 2018 08:49:43 -0700 (PDT) Received: from mediabox.local ([2001:470:30f3:1:922b:34ff:fe5d:d4b3]) by smtp.gmail.com with ESMTPSA id z7-v6sm27408321wrg.56.2018.05.09.08.49.41 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 09 May 2018 08:49:42 -0700 (PDT) From: Dan McGregor To: openembedded-core@lists.openembedded.org Date: Wed, 9 May 2018 09:49:20 -0600 Message-Id: <20180509154920.5987-2-danismostlikely@gmail.com> X-Mailer: git-send-email 2.18.0-dev In-Reply-To: <20180509154920.5987-1-danismostlikely@gmail.com> References: <20180509154920.5987-1-danismostlikely@gmail.com> MIME-Version: 1.0 Subject: [PATCH 2/2] systemd: backport fix for newer gpg-error. X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 09 May 2018 15:49:43 -0000 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit From: Dan McGregor Fix a #define conflict with new libgpg-error when gcrypt PACKAGECONFIG option is enabled. Signed-off-by: Dan McGregor --- ...rename-noreturn-into-_noreturn_-8456.patch | 200 ++++++++++++++++++ meta/recipes-core/systemd/systemd_237.bb | 1 + 2 files changed, 201 insertions(+) create mode 100644 meta/recipes-core/systemd/systemd/0001-basic-macros-rename-noreturn-into-_noreturn_-8456.patch diff --git a/meta/recipes-core/systemd/systemd/0001-basic-macros-rename-noreturn-into-_noreturn_-8456.patch b/meta/recipes-core/systemd/systemd/0001-basic-macros-rename-noreturn-into-_noreturn_-8456.patch new file mode 100644 index 00000000000..5e1d6383fc5 --- /dev/null +++ b/meta/recipes-core/systemd/systemd/0001-basic-macros-rename-noreturn-into-_noreturn_-8456.patch @@ -0,0 +1,200 @@ +Upstream-Status: Backport + +From da2c92fd08f6ffb432de16128ff5670c91005e8f Mon Sep 17 00:00:00 2001 +From: Franck Bui +Date: Thu, 15 Mar 2018 06:23:46 +0100 +Subject: [PATCH] basic/macros: rename noreturn into _noreturn_ (#8456) + +"noreturn" is reserved and can be used in other header files we include: + + [ 16s] In file included from /usr/include/gcrypt.h:30:0, + [ 16s] from ../src/journal/journal-file.h:26, + [ 16s] from ../src/journal/journal-vacuum.c:31: + [ 16s] /usr/include/gpg-error.h:1544:46: error: expected ‘,’ or ‘;’ before ‘)’ token + [ 16s] void gpgrt_log_bug (const char *fmt, ...) GPGRT_ATTR_NR_PRINTF(1,2); + +Here we include grcrypt.h (which in turns include gpg-error.h) *after* we +"noreturn" was defined in macro.h. +--- + src/basic/log.c | 4 ++-- + src/basic/log.h | 4 ++-- + src/basic/macro.h | 19 +++++++++---------- + src/basic/process-util.c | 2 +- + src/basic/process-util.h | 2 +- + src/core/main.c | 4 ++-- + src/journal/test-journal-interleaving.c | 2 +- + src/shared/pager.c | 2 +- + src/udev/collect/collect.c | 2 +- + 9 files changed, 20 insertions(+), 21 deletions(-) + +diff --git a/src/basic/log.c b/src/basic/log.c +index 12ee65a5c..837c7631d 100644 +--- a/src/basic/log.c ++++ b/src/basic/log.c +@@ -808,7 +808,7 @@ static void log_assert( + log_dispatch_internal(level, 0, file, line, func, NULL, NULL, NULL, NULL, buffer); + } + +-noreturn void log_assert_failed_realm( ++_noreturn_ void log_assert_failed_realm( + LogRealm realm, + const char *text, + const char *file, +@@ -820,7 +820,7 @@ noreturn void log_assert_failed_realm( + abort(); + } + +-noreturn void log_assert_failed_unreachable_realm( ++_noreturn_ void log_assert_failed_unreachable_realm( + LogRealm realm, + const char *text, + const char *file, +diff --git a/src/basic/log.h b/src/basic/log.h +index 5b5a25bd6..c057794c1 100644 +--- a/src/basic/log.h ++++ b/src/basic/log.h +@@ -199,7 +199,7 @@ int log_dump_internal( + char *buffer); + + /* Logging for various assertions */ +-noreturn void log_assert_failed_realm( ++_noreturn_ void log_assert_failed_realm( + LogRealm realm, + const char *text, + const char *file, +@@ -208,7 +208,7 @@ noreturn void log_assert_failed_realm( + #define log_assert_failed(text, ...) \ + log_assert_failed_realm(LOG_REALM, (text), __VA_ARGS__) + +-noreturn void log_assert_failed_unreachable_realm( ++_noreturn_ void log_assert_failed_unreachable_realm( + LogRealm realm, + const char *text, + const char *file, +diff --git a/src/basic/macro.h b/src/basic/macro.h +index 89bdd852a..3a6fc6f58 100644 +--- a/src/basic/macro.h ++++ b/src/basic/macro.h +@@ -53,6 +53,15 @@ + #else + #define _fallthrough_ + #endif ++/* Define C11 noreturn without and even on older gcc ++ * compiler versions */ ++#ifndef _noreturn_ ++#if __STDC_VERSION__ >= 201112L ++#define _noreturn_ _Noreturn ++#else ++#define _noreturn_ __attribute__((noreturn)) ++#endif ++#endif + + /* Temporarily disable some warnings */ + #define DISABLE_WARNING_DECLARATION_AFTER_STATEMENT \ +@@ -414,16 +423,6 @@ static inline unsigned long ALIGN_POWER2(unsigned long u) { + #endif + #endif + +-/* Define C11 noreturn without and even on older gcc +- * compiler versions */ +-#ifndef noreturn +-#if __STDC_VERSION__ >= 201112L +-#define noreturn _Noreturn +-#else +-#define noreturn __attribute__((noreturn)) +-#endif +-#endif +- + #define DEFINE_TRIVIAL_CLEANUP_FUNC(type, func) \ + static inline void func##p(type *p) { \ + if (*p) \ +diff --git a/src/basic/process-util.c b/src/basic/process-util.c +index dc7c9ef9e..f84debdd5 100644 +--- a/src/basic/process-util.c ++++ b/src/basic/process-util.c +@@ -940,7 +940,7 @@ bool is_main_thread(void) { + return cached > 0; + } + +-noreturn void freeze(void) { ++_noreturn_ void freeze(void) { + + log_close(); + +diff --git a/src/basic/process-util.h b/src/basic/process-util.h +index 9fabe4a5b..1a3f3ca11 100644 +--- a/src/basic/process-util.h ++++ b/src/basic/process-util.h +@@ -90,7 +90,7 @@ int pid_from_same_root_fs(pid_t pid); + + bool is_main_thread(void); + +-noreturn void freeze(void); ++_noreturn_ void freeze(void); + + bool oom_score_adjust_is_valid(int oa); + +diff --git a/src/core/main.c b/src/core/main.c +index 56200a8fa..484b53d5f 100644 +--- a/src/core/main.c ++++ b/src/core/main.c +@@ -141,7 +141,7 @@ static uint64_t arg_default_tasks_max = UINT64_MAX; + static sd_id128_t arg_machine_id = {}; + static EmergencyAction arg_cad_burst_action = EMERGENCY_ACTION_REBOOT_FORCE; + +-noreturn static void freeze_or_reboot(void) { ++_noreturn_ static void freeze_or_reboot(void) { + + if (arg_crash_reboot) { + log_notice("Rebooting in 10s..."); +@@ -156,7 +156,7 @@ noreturn static void freeze_or_reboot(void) { + freeze(); + } + +-noreturn static void crash(int sig) { ++_noreturn_ static void crash(int sig) { + struct sigaction sa; + pid_t pid; + +diff --git a/src/journal/test-journal-interleaving.c b/src/journal/test-journal-interleaving.c +index 5a88b2774..d87bdbdd3 100644 +--- a/src/journal/test-journal-interleaving.c ++++ b/src/journal/test-journal-interleaving.c +@@ -37,7 +37,7 @@ + + static bool arg_keep = false; + +-noreturn static void log_assert_errno(const char *text, int error, const char *file, int line, const char *func) { ++_noreturn_ static void log_assert_errno(const char *text, int error, const char *file, int line, const char *func) { + log_internal(LOG_CRIT, error, file, line, func, + "'%s' failed at %s:%u (%s): %m", text, file, line, func); + abort(); +diff --git a/src/shared/pager.c b/src/shared/pager.c +index 75db3c985..681af9c40 100644 +--- a/src/shared/pager.c ++++ b/src/shared/pager.c +@@ -47,7 +47,7 @@ static int stored_stderr = -1; + static bool stdout_redirected = false; + static bool stderr_redirected = false; + +-noreturn static void pager_fallback(void) { ++_noreturn_ static void pager_fallback(void) { + int r; + + r = copy_bytes(STDIN_FILENO, STDOUT_FILENO, (uint64_t) -1, 0); +diff --git a/src/udev/collect/collect.c b/src/udev/collect/collect.c +index 3e278bd63..c0761a374 100644 +--- a/src/udev/collect/collect.c ++++ b/src/udev/collect/collect.c +@@ -58,7 +58,7 @@ static inline struct _mate *node_to_mate(struct udev_list_node *node) + return container_of(node, struct _mate, node); + } + +-noreturn static void sig_alrm(int signo) ++_noreturn_ static void sig_alrm(int signo) + { + exit(4); + } +-- +2.18.0-dev + diff --git a/meta/recipes-core/systemd/systemd_237.bb b/meta/recipes-core/systemd/systemd_237.bb index 150f5b2e180..744d622ab86 100644 --- a/meta/recipes-core/systemd/systemd_237.bb +++ b/meta/recipes-core/systemd/systemd_237.bb @@ -50,6 +50,7 @@ SRC_URI += "file://touchscreen.rules \ file://0030-fix-missing-of-__register_atfork-for-non-glibc-build.patch \ file://0031-fix-missing-ULONG_LONG_MAX-definition-in-case-of-mus.patch \ file://0032-memfd.patch \ + file://0001-basic-macros-rename-noreturn-into-_noreturn_-8456.patch \ " SRC_URI_append_qemuall = " file://0001-core-device.c-Change-the-default-device-timeout-to-2.patch" -- 2.18.0-dev