| 1 |
commit: bbac604599022d9b4472cb50d973d9e9223b984e |
| 2 |
Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon May 31 04:57:17 2021 +0000 |
| 4 |
Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon May 31 04:58:24 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bbac6045 |
| 7 |
|
| 8 |
sys-apps/systemd-tmpfiles: more musl fixes for 248.3 |
| 9 |
|
| 10 |
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org> |
| 11 |
|
| 12 |
.../systemd-tmpfiles/systemd-tmpfiles-248.3.ebuild | 19 ++++++++++++++++--- |
| 13 |
1 file changed, 16 insertions(+), 3 deletions(-) |
| 14 |
|
| 15 |
diff --git a/sys-apps/systemd-tmpfiles/systemd-tmpfiles-248.3.ebuild b/sys-apps/systemd-tmpfiles/systemd-tmpfiles-248.3.ebuild |
| 16 |
index 8306be7d3a9..f3b38786b1a 100644 |
| 17 |
--- a/sys-apps/systemd-tmpfiles/systemd-tmpfiles-248.3.ebuild |
| 18 |
+++ b/sys-apps/systemd-tmpfiles/systemd-tmpfiles-248.3.ebuild |
| 19 |
@@ -59,7 +59,20 @@ pkg_setup() { |
| 20 |
src_prepare() { |
| 21 |
# musl patchset from: |
| 22 |
# http://cgit.openembedded.org/openembedded-core/tree/meta/recipes-core/systemd/systemd |
| 23 |
- use elibc_musl && eapply "${WORKDIR}/${P}-musl" |
| 24 |
+ # check SRC_URI_MUSL in systemd_${PV}.bb file for exact list of musl patches |
| 25 |
+ if use elibc_musl; then |
| 26 |
+ einfo "applying musl patches and workarounds" |
| 27 |
+ eapply "${WORKDIR}/${P}-musl" |
| 28 |
+ |
| 29 |
+ # avoids re-definition of struct ethhdr, also 0006-Include-netinet-if_ether.h.patch |
| 30 |
+ append-cflags '-D__UAPI_DEF_ETHHDR=0' |
| 31 |
+ |
| 32 |
+ # src/basic/rlimit-util.c:46:19: error: format ‘%lu’ expects argument of type ‘long unsigned int’, |
| 33 |
+ # but argument 9 has type ‘rlim_t’ {aka ‘long long unsigned int’} |
| 34 |
+ # not a nice workaround, but it comes from debug messages and we don't really use this component. |
| 35 |
+ append-cflags '-Wno-error=format' |
| 36 |
+ fi |
| 37 |
+ |
| 38 |
default |
| 39 |
|
| 40 |
# https://bugs.gentoo.org/767403 |
| 41 |
@@ -168,7 +181,7 @@ src_configure() { |
| 42 |
} |
| 43 |
|
| 44 |
src_compile() { |
| 45 |
- # tmpfiles and sysusers can be built as standalone, link systemd-shared in statically. |
| 46 |
+ # tmpfiles and sysusers can be built as standalone and link systemd-shared in statically. |
| 47 |
# https://github.com/systemd/systemd/pull/16061 original implementation |
| 48 |
# we just need to pass -Dstandalone-binaries=true and |
| 49 |
# use <name>.standalone target below. |
| 50 |
@@ -206,7 +219,7 @@ src_test() { |
| 51 |
"${BUILD_DIR}"/systemd-tmpfiles.standalone || die "${FUNCNAME} failed" |
| 52 |
} |
| 53 |
|
| 54 |
-# adapted from opentmpfiles ebuild |
| 55 |
+# stolen from opentmpfiles ebuild |
| 56 |
add_service() { |
| 57 |
local initd=$1 |
| 58 |
local runlevel=$2 |
Archives