diff options
Diffstat (limited to 'sys-apps/systemd-tmpfiles')
| -rw-r--r-- | sys-apps/systemd-tmpfiles/Manifest | 3 | ||||
| -rw-r--r-- | sys-apps/systemd-tmpfiles/files/musl-1.2.2.patch | 14 | ||||
| -rw-r--r-- | sys-apps/systemd-tmpfiles/systemd-tmpfiles-246.ebuild | 10 |
3 files changed, 23 insertions, 4 deletions
diff --git a/sys-apps/systemd-tmpfiles/Manifest b/sys-apps/systemd-tmpfiles/Manifest index c1522ed3b037..cde2a9b118d0 100644 --- a/sys-apps/systemd-tmpfiles/Manifest +++ b/sys-apps/systemd-tmpfiles/Manifest @@ -1,7 +1,8 @@ +AUX musl-1.2.2.patch 656 BLAKE2B 73abdd679bfb99f8085e3341a80059f62e836622c765c89d4d0e8123f8ad391eca5a0eacf006f1a92bcfce278e806bc565972c2cf2b0c08862a4bcda4799d7f1 SHA512 a72ebb54d7f7b2ba9fbfcae1a6d03ff5bc0511923429502e1dd1c19bb57b06b184e0c762a5b9a9d824a72c2a3e293f7805b7f0cd7be9b8b4d9be676b39c7604d AUX stmpfiles-dev.initd 421 BLAKE2B af962a76a2f3985aff460193a9bdcb7d340a3cf0a5c7cb65150dade564dc780d91634028b5f8a87750be66e6c47bbe519088fbc0c46047f180e93c3eabffc16d SHA512 1eac910984bda9ba5d8e9c5b17718c356f90b41ccf22bb68393b4f00901c8999501e1b482decbf22e6a16157f430eee159b3332f6e82a9442423adc884057475 AUX stmpfiles-setup.initd 396 BLAKE2B 54796d5db9fc350a98e467cf763afaa82bc27f547755f0631f5f37f2d6e1382e361878aed80545bbb5ba198b564337e4083c073f73552d8bed4a8732ff6b819f SHA512 12201b6a3d7f4a178ca9504638cbbc7e518c5075ce9a3b2653650960b54225f3516381dd4e0366d13f16aecaa1dec40ad1a41ef1f849b6c45be81c49108bdccd AUX stmpfiles.confd 56 BLAKE2B c26aafd0e47b01354c7f20869cd71d36d7a8560e9013863eca6abb736d78c1eeb3eec00427c6bc8d37ab5b9bb88155d11b9e18809da9110ed40c77a34ebb1a82 SHA512 464cb238b87a8fbeb57e6534d0f2d861e8ade4219be9b7e2faf05c799f717cd2f23d176393bdd3c3b236058aa6f8bda837ad947fbe8f9489405760e9bfedbe40 DIST systemd-246.tar.gz 9534036 BLAKE2B 71b72abcd4d066d35d45d9835d41bec8faa9a7eddc80b48fe7073223f07d32f78a8442c52dc0800940f9750d9c5502123a633738981d797cf610d85df2035bf0 SHA512 7103f7da53f7ced3b5543c238f23bd11c82af8e37166c1720a90576b6b431b4329320c78726166c65a9f5e101dd465c0a86dd13c586c4e55e608a6273d8f324f DIST systemd-tmpfiles-246-musl.tar.xz 25860 BLAKE2B 87fc4ca37abec9c1a0cee48bf78c575bd53e16a50d427eff338159dc6d5474ffd328af533ccf90a0e1e160a16baa7378070f418f2be0d7f77e00907a5d07d30e SHA512 4a93d9f0cb2df2dd0a2f91820615dd3a95d19583f45dc0589e37ceaedfc2040112310a6e3fc525e28e222e96a91498af2fe8541b5bf86a635c0f52dd1a84deb7 -EBUILD systemd-tmpfiles-246.ebuild 4576 BLAKE2B 269b7674abee8b6cf280fb2f4c26e58efc0f5749ffbc2f05c56bbb7140e0048c92eeb91aa720e4137a8305237970b88e2db5ba0d5dbb1babd77b383e27d3d7c2 SHA512 9e12386a158045ba960792921ec695229b118ae98a26288ab78e4cdf8360b2c8d2587afe5c280d0864c2810da059b181e75979a09223b0a92aa502fd4d5f56d1 +EBUILD systemd-tmpfiles-246.ebuild 4690 BLAKE2B f0234c3b84dfe8023613503a4acd813ccb93912d177d11bd7c98a5b162e424c3121440c22d732ca49f5e79ef6455718a75344157245ae3a734da977c8cfd3a1e SHA512 08ecdca206a0af1eda980183ebf98dbe3380366174268600f3fa3844e335691bba09e1489aeda5cb9ec4af12e2a1c468baa392e4951cbd55b1a00da392fea4b7 MISC metadata.xml 251 BLAKE2B e9e9d48943645d8b737bc1f7ab0efb05db0f8eddad759c9bb40d07dc008fbfb8f5cca2020de71a9ff6945f5d66292ac02355773545010cd49c77fe6dd5ab7b40 SHA512 1b6a6955118c1a74cc89a77d6de9be8f4ff9c7137c186753462670a5b93457dfd034ad5d1f4d2507ac95cc149c2a042fa5324220b58702a56b09d91de40151c9 diff --git a/sys-apps/systemd-tmpfiles/files/musl-1.2.2.patch b/sys-apps/systemd-tmpfiles/files/musl-1.2.2.patch new file mode 100644 index 000000000000..dc8905d5aabc --- /dev/null +++ b/sys-apps/systemd-tmpfiles/files/musl-1.2.2.patch @@ -0,0 +1,14 @@ +diff --git a/meson.build b/meson.build +index bea9935..03b40f2 100644 +--- a/meson.build ++++ b/meson.build +@@ -510,7 +510,8 @@ foreach ident : [ + #include <sys/stat.h> + #include <unistd.h>'''], + ['explicit_bzero' , '''#include <string.h>'''], +- ['reallocarray', '''#include <malloc.h>'''], ++ ['reallocarray', '''#include <malloc.h> ++ #include <stdlib.h>'''], + ['set_mempolicy', '''#include <stdlib.h> + #include <unistd.h>'''], + ['get_mempolicy', '''#include <stdlib.h> diff --git a/sys-apps/systemd-tmpfiles/systemd-tmpfiles-246.ebuild b/sys-apps/systemd-tmpfiles/systemd-tmpfiles-246.ebuild index e4e1196d3663..d243c5691c3b 100644 --- a/sys-apps/systemd-tmpfiles/systemd-tmpfiles-246.ebuild +++ b/sys-apps/systemd-tmpfiles/systemd-tmpfiles-246.ebuild @@ -31,6 +31,7 @@ RDEPEND="${DEPEND} " BDEPEND=" + ${PYTHON_DEPS} app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets @@ -40,20 +41,24 @@ BDEPEND=" >=sys-apps/coreutils-8.16 sys-devel/m4 virtual/pkgconfig - test? ( ${PYTHON_DEPS} ) " S="${WORKDIR}/systemd-${PV}" pkg_setup() { - use test && python-any-r1_pkg_setup + python-any-r1_pkg_setup } src_prepare() { # musl patchset from: # http://cgit.openembedded.org/openembedded-core/tree/meta/recipes-core/systemd/systemd use elibc_musl && eapply "${WORKDIR}/${P}-musl" + use elibc_musl && eapply "${FILESDIR}/musl-1.2.2.patch" # https://bugs.gentoo.org/766833 default + + # https://bugs.gentoo.org/767403 + python_fix_shebang src/test/*.py + python_fix_shebang tools/*.py } src_configure() { @@ -187,7 +192,6 @@ src_install() { src_test() { # 'meson test' will compile full systemd, but we can still outsmart it - python_fix_shebang src/test/test-systemd-tmpfiles.py "${EPYTHON}" src/test/test-systemd-tmpfiles.py \ "${BUILD_DIR}"/systemd-tmpfiles.standalone || die "${FUNCNAME} failed" } |