summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorA. Wilcox <AWilcox@Wilcox-Tech.com>2024-05-25 12:48:51 -0500
committerA. Wilcox <AWilcox@Wilcox-Tech.com>2024-06-11 14:03:56 -0500
commit0fc9096348f8b57c2170d0908f2cc0b708129e1d (patch)
tree8b6791adf60a24dd55984078c5ee56d112ebb41c
parent2f1c361f2858e55715044a8376311d74b832529e (diff)
downloadpackages-0fc9096348f8b57c2170d0908f2cc0b708129e1d.tar.gz
packages-0fc9096348f8b57c2170d0908f2cc0b708129e1d.tar.bz2
packages-0fc9096348f8b57c2170d0908f2cc0b708129e1d.tar.xz
packages-0fc9096348f8b57c2170d0908f2cc0b708129e1d.zip
system/openrc: Fix for GCC -fno-common
-rw-r--r--system/openrc/APKBUILD4
-rw-r--r--system/openrc/modern-gcc.patch14
2 files changed, 17 insertions, 1 deletions
diff --git a/system/openrc/APKBUILD b/system/openrc/APKBUILD
index f0ea83c39..632b55452 100644
--- a/system/openrc/APKBUILD
+++ b/system/openrc/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer:
pkgname=openrc
pkgver=0.24.1
-pkgrel=13
+pkgrel=14
pkgdesc="OpenRC manages the services, startup and shutdown of a host"
url="https://github.com/OpenRC/openrc"
arch="all"
@@ -20,6 +20,7 @@ source="$pkgname-$pkgver.tar.gz::https://github.com/OpenRC/openrc/archive/$pkgve
0005-rc-pull-in-sysinit-and-boot-as-stacked-levels-when-n.patch
hwclock-grep.patch
+ modern-gcc.patch
openrc-configuration.patch
openrc.logrotate
@@ -88,6 +89,7 @@ aedf77f9159fefb4bd5f30a29a33b6aedbc986c9a0f993aa928cc79fbe24aac76bd9e5974dcce52e
d54630d40a2d6b10a325cb012d4efcda997a60c008ca953ce5d60059d3f267308a59dabddf93a5fc0d301aa91967137d144effbe5f574394af768ce4ebc48738 0004-hide-error-when-migrating-var-run-to-run.patch
39a35c54ec9112fe84c901ed155a711cec8e194af02d5483ee60b80743dab12391e6fdc7b3da2f86844dd4edcf53e681ff95bd4d6fa1101a89ce54dce2ddbb7c 0005-rc-pull-in-sysinit-and-boot-as-stacked-levels-when-n.patch
43355d72ad82858787e240450ae556cdd40aa9a3719545991d76719df80cc5c851c21374b339a6953f0344f1468e08e99c4da11334dc0b72647f4aa1db08558c hwclock-grep.patch
+aeb63843b69bf5dc3e513a9b0fa1c5631b509b2ecc9e127d6d5e1ac18254375a45afb6e82429d2c559e29aef70e01286b82cabbdc7c3907a5cce6cdfb32be4f9 modern-gcc.patch
634c09a36d542a69b147a292418fa99a5d071d7a384bd2d2b30917a986cdc82ef4e96e380bc3a154cb0709c57d5308320c30fd6973972d6e6d7f8ac5b2e31bea openrc-configuration.patch
12bb6354e808fbf47bbab963de55ee7901738b4a912659982c57ef2777fff9a670e867fcb8ec316a76b151032c92dc89a950d7d1d835ef53f753a8f3b41d2cec openrc.logrotate
99b542c0903ad6874b8c308b2e0660a4fe2ff9db962dfec65325cd12c368873a2ae800d5e6d42dc4deff775e1d5c0068869eb72581f7ab16e88d5738afe1d3dd hostname.initd
diff --git a/system/openrc/modern-gcc.patch b/system/openrc/modern-gcc.patch
new file mode 100644
index 000000000..e50029af2
--- /dev/null
+++ b/system/openrc/modern-gcc.patch
@@ -0,0 +1,14 @@
+Ensure we can build with -fno-common.
+--- openrc-0.24.1/src/rc/rc-logger.h.old 2017-03-14 19:58:26.000000000 -0500
++++ openrc-0.24.1/src/rc/rc-logger.h 2024-05-25 12:47:43.244186307 -0500
+@@ -13,8 +13,8 @@
+ #ifndef RC_LOGGER_H
+ #define RC_LOGGER_H
+
+-pid_t rc_logger_pid;
+-int rc_logger_tty;
++extern pid_t rc_logger_pid;
++extern int rc_logger_tty;
+ extern bool rc_in_logger;
+
+ void rc_logger_open(const char *runlevel);