aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDave Hughes <davidhughes205@gmail.com>2021-04-29 15:23:13 -0400
committerDave Hughes <davidhughes205@gmail.com>2021-04-29 15:23:13 -0400
commitd23d4ba813473c8388e1b7f8d5c443283653a934 (patch)
tree48571a38aa1a1b765b1a96831e45124e88e47246 /x11-base
parentx11-base/xorg-server: sync with ::gentoo (diff)
downloadmusl-d23d4ba813473c8388e1b7f8d5c443283653a934.tar.gz
musl-d23d4ba813473c8388e1b7f8d5c443283653a934.tar.bz2
musl-d23d4ba813473c8388e1b7f8d5c443283653a934.zip
x11-base/xorg-server: rebase patch for xorg-server on arm
Package-Manager: Portage-3.0.18, Repoman-3.0.3 Signed-off-by: Dave Hughes <davidhughes205@gmail.com>
Diffstat (limited to 'x11-base')
-rw-r--r--x11-base/xorg-server/files/xorg-server-1.20.11-arm-musl.patch12
-rw-r--r--x11-base/xorg-server/xorg-server-1.20.11.ebuild1
2 files changed, 13 insertions, 0 deletions
diff --git a/x11-base/xorg-server/files/xorg-server-1.20.11-arm-musl.patch b/x11-base/xorg-server/files/xorg-server-1.20.11-arm-musl.patch
new file mode 100644
index 0000000..541b5c7
--- /dev/null
+++ b/x11-base/xorg-server/files/xorg-server-1.20.11-arm-musl.patch
@@ -0,0 +1,12 @@
+diff -Naur a/hw/xfree86/common/compiler.h b/hw/xfree86/common/compiler.h
+--- a/hw/xfree86/common/compiler.h 2021-04-29 15:19:17.958218267 -0400
++++ b/hw/xfree86/common/compiler.h 2021-04-29 15:19:44.362218296 -0400
+@@ -518,7 +518,7 @@
+ barrier();
+ }
+
+-#elif defined(__mips__) || (defined(__arm32__) && !defined(__linux__))
++#elif defined(__mips__) || (defined(__arm32__) && !defined(__GLIBC__))
+ #if defined(__arm32__) || defined(__mips64)
+ #define PORT_SIZE long
+ #else
diff --git a/x11-base/xorg-server/xorg-server-1.20.11.ebuild b/x11-base/xorg-server/xorg-server-1.20.11.ebuild
index a1a3a2f..26b1312 100644
--- a/x11-base/xorg-server/xorg-server-1.20.11.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.20.11.ebuild
@@ -197,6 +197,7 @@ src_prepare() {
if use elibc_musl ; then
eapply "${FILESDIR}"/xorg-server-1.20.11-fix-musl-input_event.patch
+ eapply "${FILESDIR}"/xorg-server-1.20.11-arm-musl.patch
fi
eapply_user