main/openrc: build fix for musl (don't use libc internal defines)

2 files changed, 77 insertions, 1 deletions

diff --git a/main/openrc/APKBUILD b/main/openrc/APKBUILD
index 3bd49ed1a1..1c161e3908 100644
--- a/main/openrc/APKBUILD
+++ b/main/openrc/APKBUILD
@@ -2,7 +2,7 @@
 pkgname=openrc
 pkgver=0.11.8
 _ver=${pkgver/_git*/}
-pkgrel=0
+pkgrel=1
 pkgdesc="OpenRC manages the services, startup and shutdown of a host"
 url="http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git"
 arch="all"
@@ -17,6 +17,7 @@ source="http://distfiles.gentoo.org/distfiles/$pkgname-$_ver.tar.bz2
 	swap-umount-tmpfs.patch
 	swap-ifexists.patch
 	rc-sys-lxc.patch
+	begin-end-decls.patch
 
 	hostname.initd
 	hwdrivers.initd
@@ -69,6 +70,7 @@ md5sums="d896371d533a22de4cf57c7371c4d6e8  openrc-0.11.8.tar.bz2
 c2af5e52da614a6cef02d1e4d537e360  swap-umount-tmpfs.patch
 1c426b84d13a725ad493647b5253f239  swap-ifexists.patch
 4a2ec4d9d988423fdafc332d2174ecdf  rc-sys-lxc.patch
+00c0d99a19915fac57a20e5995f57bdb  begin-end-decls.patch
 c32e15b0858eef708497e7ee6355a055  hostname.initd
 ce3832d8ed5906367ef0f4776b38f3bd  hwdrivers.initd
 33ca3e558c42cdd17adccbc7807298f7  keymaps.initd
@@ -76,3 +78,31 @@ ce3832d8ed5906367ef0f4776b38f3bd  hwdrivers.initd
 8c9e46ea5898d375e709a82503f7e277  modloop.initd
 55aeca82475cb5a146abff8333bfdf85  networking.initd
 c1ec888202d868710b5749f7b217d1e3  modloop.confd"
+sha256sums="e1f7c5ed98a63178c20f3d023a7d35fe416e8e7db2f0cf78ff346a6d2f7949a9  openrc-0.11.8.tar.bz2
+c807aed11d7eb42de5c421a6d117532f6215697f159f40cb3404bdc80270bee1  openrc-0.4.3-mkmntdirs.patch
+e869e2076c10a7134f5d9e4ae4a5d09ca35c6333d400556f1e329170d2e58066  0001-Force-root-be-rw-before-localmount.patch
+84d67ed2cf050e20f52d4ea048e7452e78356ba02b396d8c064a4458c0811ea4  swap-umount-tmpfs.patch
+8978b00492d90b573f5254cc394582e8f1a5cd8b4d6c928fa0a9a022dd17fe9c  swap-ifexists.patch
+0e527b58f4ba325a853fccb58e7fab99a31335eee59d01856e4d1f103db8c581  rc-sys-lxc.patch
+d3b20f5cb053ed24d7b76b75aeef98b9f2bc77401930fa934c9452fa634db18c  begin-end-decls.patch
+e91790d23135c43102ea73e5768d4b0d25e9a7d28fca90f1b902aac9c41e1d5c  hostname.initd
+a71a38309beb6f4718a2ece863659735a5e157a7c927518265e562cd90fc71ff  hwdrivers.initd
+a6f013c02ca3efb4e29b4844e4d27710cfd319e66157c4fd88a8169e06e7151f  keymaps.initd
+42f7add323ee77d1ee04d96ed4b52897dd1d2a32ab361fd755d4eb707d67e5be  modules.initd
+48b8c030ff9b9dc8929eb6e7271659d6d7ad297384886950781da7543a9601e1  modloop.initd
+dc30c4e0cac37597dda3f97f68aa2f8a5e87a9856de8b2fd08579916117de8ed  networking.initd
+a5a0316cd59f5401b1d789bb466c98186201277ba6f014017b14965fcc10c254  modloop.confd"
+sha512sums="aaea9f1e1d08c367beb6d35bcc1d258eb9d7b71a659c05088f9027b0558aae068b2ad7c221cf8ff8b8950f5a4a5c187ee7b986ce2d475a9e3cccda74d040f780  openrc-0.11.8.tar.bz2
+eee27fbf72776fb70d3aa6c6464180731d522191e5755aa431ab09ea11dd11bf001a95618adcaa5ccc08455268003ca2917b2bff31adc9894214221c469a97db  openrc-0.4.3-mkmntdirs.patch
+51c77be5ab726d50ef1d0b9dab644edef1ff739e855e3a12ab27beada8911998e0c6a7491eb92df621dcdb633b672d933a4edc00115ec43bdf1271105239ebb7  0001-Force-root-be-rw-before-localmount.patch
+8fd442d372401740b1c523367c928f49efa8179604aac2b517cdc4264daf303056d5a5e0a2c996db5e6ef9b7cdd0619a16cfabc15c3399e322384844e2a36542  swap-umount-tmpfs.patch
+c5b8806c693b0ea48ff87e0e3669304f5c2f95954ad54814889047a933f367081a8c8d3bb771dd1ed6c3bc845df894232bd6b662066d09eba3abf3964187d1d1  swap-ifexists.patch
+31dd91ed667b053766693943b31645c4236681b786108a1aa27f3acf86402feb273f2d66352a840e3afa10deb64b165edc4fe9f93ac9b58d3b45fc28222707b0  rc-sys-lxc.patch
+92788e88c0da278f6673df90cd34f8204b8226305f7ee3e43e33566f1c7b8ff819bba954d82c14305f4174a76398abe7e029ee99e816cc94963a65d42ec89c92  begin-end-decls.patch
+6de80fd9ff9692bb15aa0a90255beea939a4f79b4fdff9fdf443d85bf168c162183efa44d7769af855f9c2460c77f29df19037eca09156ac42dd01fba7be9934  hostname.initd
+932669915d0e4c8b7d23823c6d057d5d3bbc7f2f67532547201fea986c7e3208607d69cfdd41b0b0b1828f33c4e87efb8d65f7a715c33a8c9cdc846b7ec7439b  hwdrivers.initd
+ee58de9b8608d3f3aa6111b9b43977b91bd2c39bcc3471711812fe740dbc49eee8a7ddd6f2878b90c8eb9bcc5a2f543cb2d82c04f16c263ffad58de7955d8db5  keymaps.initd
+103889e4e183105b87052ead50747358c5cb17627f93c83b84434f9e615f8cad3ae554fb78e1f9f4c634265313d7ae11fe3760a5c97a5d8b4ddf48aa2b489be7  modules.initd
+950cdf039b0b0af737021134fe7324e9d87424b7e203549d4eef177571c4095519cad095dd281369048a874422843f86c75913e0e301499850827806891e90e9  modloop.initd
+b46b34d96ba01aa7d19cae12560fbb2724762223fb5717b9d8d8c46c09dbc35829b9626c96cc08b9388614baa990e2fb526aab12c44667851731cae949bded1a  networking.initd
+aa702a7da8e6c0e5d8738febaf6b4e4cb021b30ce5c1809b530abf2b36739079446b16fc054740da8d86ed099942cf5deed6597cedb64c058f3def587a8b4689  modloop.confd"
diff --git a/main/openrc/begin-end-decls.patch b/main/openrc/begin-end-decls.patch
new file mode 100644
index 0000000000..19e67949b9
--- /dev/null
+++ b/main/openrc/begin-end-decls.patch
@@ -0,0 +1,46 @@
+--- openrc-0.11.8.orig/src/libeinfo/einfo.h
++++ openrc-0.11.8/src/libeinfo/einfo.h
+@@ -48,7 +48,9 @@
+ # endif
+ #endif
+ 
+-__BEGIN_DECLS
++#ifdef  __cplusplus
++extern "C" {
++#endif
+ 
+ /*! @brief Color types to use */
+ typedef enum
+@@ -140,5 +142,8 @@
+ /*! @brief Prefix each einfo line with something */
+ void eprefix(const char * EINFO_RESTRICT);
+ 
+-__END_DECLS
++#ifdef __cplusplus
++}
++#endif
++
+ #endif
+--- openrc-0.11.8.orig/src/librc/rc.h.in
++++ openrc-0.11.8/src/librc/rc.h.in
+@@ -31,7 +31,9 @@
+ #include <stdbool.h>
+ #include <stdio.h>
+ 
+-__BEGIN_DECLS
++#ifdef  __cplusplus
++extern "C" {
++#endif
+ 
+ #define RC_PREFIX "@PREFIX@"
+ #define RC_SYSCONFDIR		"@SYSCONFDIR@"
+@@ -563,5 +565,8 @@
+  * we have our own */
+ ssize_t rc_getline(char **, size_t *, FILE *);
+ 
+-__END_DECLS
++#ifdef  __cplusplus
++}
++#endif
++
+ #endif