0006-src-rc-rc-logger.h-fix-build-failure-against-gcc-10.patch 1.9 KB

12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152
  1. From 375ef42393f3dc6edbaa2cb70c79b2366072db38 Mon Sep 17 00:00:00 2001
  2. From: Sergei Trofimovich <slyfox@gentoo.org>
  3. Date: Sun, 19 Jan 2020 15:24:20 +0000
  4. Subject: [PATCH] src/rc/rc-logger.h: fix build failure against gcc-10
  5. On gcc-10 (and gcc-9 -fno-common) build fails as:
  6. ```
  7. cc -L../librc -L../libeinfo -O2 -g -std=c99 -Wall -Wextra -Wimplicit -Wshadow \
  8. -Wformat=2 -Wmissing-prototypes -Wmissing-declarations -Wmissing-noreturn \
  9. -Wmissing-format-attribute -Wnested-externs -Winline -Wwrite-strings \
  10. -Wcast-align -Wcast-qual -Wpointer-arith -Wdeclaration-after-statement \
  11. -Wsequence-point -Werror=implicit-function-declaration \
  12. -Wl,-rpath=/lib -o openrc rc.o rc-logger.o rc-misc.o rc-plugin.o _usage.o -lutil -lrc -leinfo -Wl,-Bdynamic -ldl
  13. ld: rc-logger.o:/home/slyfox/dev/git/openrc/src/rc/rc-logger.h:16:
  14. multiple definition of `rc_logger_pid'; rc.o:openrc/src/rc/rc-logger.h:16: first defined here
  15. ld: rc-logger.o:/home/slyfox/dev/git/openrc/src/rc/rc-logger.h:17:
  16. multiple definition of `rc_logger_tty'; rc.o:openrc/src/rc/rc-logger.h:17: first defined here
  17. ```
  18. gcc-10 will change the default from -fcommon to fno-common:
  19. https://gcc.gnu.org/PR85678.
  20. The error also happens if CFLAGS=-fno-common passed explicitly.
  21. This fixes #348.
  22. [Patch taken from upstream:
  23. https://github.com/OpenRC/openrc/commit/375ef42393f3dc6edbaa2cb70c79b2366072db38]
  24. Signed-off-by: Heiko Thiery <heiko.thiery@gmail.com>
  25. ---
  26. src/rc/rc-logger.h | 4 ++--
  27. 1 file changed, 2 insertions(+), 2 deletions(-)
  28. diff --git a/src/rc/rc-logger.h b/src/rc/rc-logger.h
  29. index bf6e3e57..1da294b0 100644
  30. --- a/src/rc/rc-logger.h
  31. +++ b/src/rc/rc-logger.h
  32. @@ -13,8 +13,8 @@
  33. #ifndef RC_LOGGER_H
  34. #define RC_LOGGER_H
  35. -pid_t rc_logger_pid;
  36. -int rc_logger_tty;
  37. +extern pid_t rc_logger_pid;
  38. +extern int rc_logger_tty;
  39. extern bool rc_in_logger;
  40. void rc_logger_open(const char *runlevel);
  41. --
  42. 2.20.1