From 1dbc772ea5dbbac9a8f910033d0fb5abd7b45459 Mon Sep 17 00:00:00 2001 From: Mike Gilbert Date: Sat, 22 Aug 2015 13:09:48 -0400 Subject: [PATCH] sys-apps/systemd: Backport build fix for alpha Bug: https://bugs.gentoo.org/543900 Package-Manager: portage-2.2.20_p134 --- ...xpid-syscall-on-alpha-for-raw_getpid.patch | 30 +++++++++++++++++++ sys-apps/systemd/systemd-224-r1.ebuild | 1 + 2 files changed, 31 insertions(+) create mode 100644 sys-apps/systemd/files/224-0002-Use-getxpid-syscall-on-alpha-for-raw_getpid.patch diff --git a/sys-apps/systemd/files/224-0002-Use-getxpid-syscall-on-alpha-for-raw_getpid.patch b/sys-apps/systemd/files/224-0002-Use-getxpid-syscall-on-alpha-for-raw_getpid.patch new file mode 100644 index 000000000000..40e2d1c15e12 --- /dev/null +++ b/sys-apps/systemd/files/224-0002-Use-getxpid-syscall-on-alpha-for-raw_getpid.patch @@ -0,0 +1,30 @@ +From a242a99d42276b6b764f80bd0de70c26e5c5f1d4 Mon Sep 17 00:00:00 2001 +From: Matt Turner +Date: Tue, 4 Aug 2015 14:47:01 -0700 +Subject: [PATCH] Use getxpid syscall on alpha for raw_getpid() + +Alpha does not have a getpid syscall, but rather has getxpid to match +OSF/1. +--- + src/basic/missing.h | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/basic/missing.h b/src/basic/missing.h +index ed6cd80..34ab025 100644 +--- a/src/basic/missing.h ++++ b/src/basic/missing.h +@@ -977,7 +977,11 @@ static inline int raw_clone(unsigned long flags, void *child_stack) { + } + + static inline pid_t raw_getpid(void) { ++#if defined(__alpha__) ++ return (pid_t) syscall(__NR_getxpid); ++#else + return (pid_t) syscall(__NR_getpid); ++#endif + } + + #if !HAVE_DECL_RENAMEAT2 +-- +2.5.0 + diff --git a/sys-apps/systemd/systemd-224-r1.ebuild b/sys-apps/systemd/systemd-224-r1.ebuild index 7d4b2b79fa97..521109e8dc22 100644 --- a/sys-apps/systemd/systemd-224-r1.ebuild +++ b/sys-apps/systemd/systemd-224-r1.ebuild @@ -105,6 +105,7 @@ fi PATCHES=( "${FILESDIR}/218-Dont-enable-audit-by-default.patch" "${FILESDIR}/224-0001-networkd-fix-neworkd-crash.patch" + "${FILESDIR}/224-0002-Use-getxpid-syscall-on-alpha-for-raw_getpid.patch" ) pkg_pretend() { -- 2.26.2