Fix the build with GCC 10 which otherwise fails due to function parameters being unnamed.
Signed-off-by: Ross Burton <[email protected]> --- .../shadow/files/prototypes.patch | 38 +++++++++++++++++++ meta/recipes-extended/shadow/shadow_4.19.4.bb | 1 + 2 files changed, 39 insertions(+) create mode 100644 meta/recipes-extended/shadow/files/prototypes.patch diff --git a/meta/recipes-extended/shadow/files/prototypes.patch b/meta/recipes-extended/shadow/files/prototypes.patch new file mode 100644 index 00000000000..dfdfc9b47a8 --- /dev/null +++ b/meta/recipes-extended/shadow/files/prototypes.patch @@ -0,0 +1,38 @@ +Give unused function arguments names as GCC 10 will fail otherwise. + +This is a continuation of a PR that has been merged upstream[1] but +this merged after expiry.c[2] and logout.c[3] were removed. + +[1] shadow cb0ec030 ("Fix build failure on hosts with gcc 10") +[2] shadow 2bb1b984 ("*/: expiry(1): Remove program") +[3] shadow eec97ce4 ("Remove unused `logoutd` utility") + +Upstream-Status: Inappropriate [code no longer exists upstream] +Signed-off-by: Ross Burton <[email protected]> + +diff --git a/src/expiry.c b/src/expiry.c +index 8da89bd..0abf011 100644 +--- a/src/expiry.c ++++ b/src/expiry.c +@@ -37,7 +37,7 @@ static void process_flags (int argc, char **argv); + * catch_signals - signal catcher + */ + static void +-catch_signals(int) ++catch_signals(MAYBE_UNUSED int _1) + { + _exit (10); + } +diff --git a/src/logoutd.c b/src/logoutd.c +index c87b75c..09a24b3 100644 +--- a/src/logoutd.c ++++ b/src/logoutd.c +@@ -116,7 +116,7 @@ static void send_mesg_to_tty (int tty_fd) + * off from the system. + */ + int +-main(int argc, char *[]) ++main(int argc, char *argv[]) + { + pid_t pid; + diff --git a/meta/recipes-extended/shadow/shadow_4.19.4.bb b/meta/recipes-extended/shadow/shadow_4.19.4.bb index 7bc7f745555..9fe6a27e411 100644 --- a/meta/recipes-extended/shadow/shadow_4.19.4.bb +++ b/meta/recipes-extended/shadow/shadow_4.19.4.bb @@ -14,6 +14,7 @@ GITHUB_BASE_URI = "https://github.com/shadow-maint/shadow/releases"; SRC_URI = "${GITHUB_BASE_URI}/download/${PV}/${BP}.tar.gz \ ${@bb.utils.contains('PACKAGECONFIG', 'pam', '${PAM_SRC_URI}', '', d)} \ file://useradd \ + file://prototypes.patch \ " SRC_URI:append:class-target = " \ -- 2.43.0
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#233064): https://lists.openembedded.org/g/openembedded-core/message/233064 Mute This Topic: https://lists.openembedded.org/mt/118300101/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
