diff options
| author | Timo Teräs <timo.teras@iki.fi> | 2013-10-15 08:14:42 +0000 |
|---|---|---|
| committer | Timo Teräs <timo.teras@iki.fi> | 2013-10-15 08:14:42 +0000 |
| commit | 73929b8e73992a27d123ece9cc94e6a2b3265457 (patch) | |
| tree | 2ed1e77bc36683dd296b94c8921e717b2b64d741 /main/xorg-server | |
| parent | 2e45133d0c426bb80b55ad54bb934d2825b75b69 (diff) | |
| download | aports-73929b8e73992a27d123ece9cc94e6a2b3265457.tar.bz2 aports-73929b8e73992a27d123ece9cc94e6a2b3265457.tar.xz | |
main/xorg-server: fix musl/arm build
Diffstat (limited to 'main/xorg-server')
| -rw-r--r-- | main/xorg-server/APKBUILD | 10 | ||||
| -rw-r--r-- | main/xorg-server/fix-musl-arm.patch | 20 |
2 files changed, 27 insertions, 3 deletions
diff --git a/main/xorg-server/APKBUILD b/main/xorg-server/APKBUILD index f1d773ac5c..706fe36011 100644 --- a/main/xorg-server/APKBUILD +++ b/main/xorg-server/APKBUILD @@ -67,6 +67,7 @@ makedepends=" source="http://xorg.freedesktop.org/releases/individual/xserver/$pkgname-$pkgver.tar.bz2 autoconfig-nvidia.patch autoconfig-sis.patch + fix-musl-arm.patch " @@ -169,10 +170,13 @@ xnest() { md5sums="86abeb08d3f7ead3a2bd3d6a9ba6714e xorg-server-1.14.3.tar.bz2 ea4852dedbb89550f6bc113ca66348a2 autoconfig-nvidia.patch -825ca99ea9348c66abdf2c479e0af485 autoconfig-sis.patch" +825ca99ea9348c66abdf2c479e0af485 autoconfig-sis.patch +ccc57d75801b716a45ce6a67f4a9f163 fix-musl-arm.patch" sha256sums="02125ae13a443dcbb55f964d5c37f1da2f58ad54c2102356037bec23c1b84f5e xorg-server-1.14.3.tar.bz2 66e25f76a7496c429e0aff4b0670f168719bb0ceaeb88c6f2272f2bf3ed21162 autoconfig-nvidia.patch -7d5d36dd152eb0fab277a4aeba0a08ad77049e591a0dea92f565a4b62f0d0a50 autoconfig-sis.patch" +7d5d36dd152eb0fab277a4aeba0a08ad77049e591a0dea92f565a4b62f0d0a50 autoconfig-sis.patch +0cb8f7a5628037f24d05d86eed26ca0252c3ff95856367b606b64080da6db432 fix-musl-arm.patch" sha512sums="d5379e2f52e93985ab2636ca02f503baadd359a4ec05bed80162213392e16d433a2b7308e90cdd18c1a0bd283429f2c8b8758b5a2c585923533cced6245de989 xorg-server-1.14.3.tar.bz2 4dcaa60fbfc61636e7220a24a72bba19984a6dc752061cb40b1bd566c0e614d08927b6c223ffaaaa05636765fddacdc3113fde55d25fd09cd0c786ff44f51447 autoconfig-nvidia.patch -30a78f4278edd535c45ee3f80933427cb029a13abaa4b041f816515fdd8f64f00b9c6aef50d4eba2aaf0d4f333e730399864fd97fa18891273601c77a6637200 autoconfig-sis.patch" +30a78f4278edd535c45ee3f80933427cb029a13abaa4b041f816515fdd8f64f00b9c6aef50d4eba2aaf0d4f333e730399864fd97fa18891273601c77a6637200 autoconfig-sis.patch +fdb45ed50e5aeac1bc8d22f1377517c52235aea7d15bb4664a774aea5c2c4fbbc9654dce6e5b3fee15ec9eadb2f87f88ca7d62a36c458df8a0dfa5b431ab225a fix-musl-arm.patch" diff --git a/main/xorg-server/fix-musl-arm.patch b/main/xorg-server/fix-musl-arm.patch new file mode 100644 index 0000000000..ab9075d050 --- /dev/null +++ b/main/xorg-server/fix-musl-arm.patch @@ -0,0 +1,20 @@ +--- xorg-server-1.14.3/hw/xfree86/common/compiler.h.orig ++++ xorg-server-1.14.3/hw/xfree86/common/compiler.h +@@ -720,7 +720,7 @@ + :"r"(val), "r"(addr), "i"(ASI_PL)); + } + +-#elif defined(__mips__) || (defined(__arm32__) && !defined(__linux__)) ++#elif defined(__mips__) || (defined(__arm32__) && !defined(__GLIBC__)) + #ifdef __arm32__ + #define PORT_SIZE long + #else +@@ -995,7 +995,7 @@ + return xf86ReadMmio32Le((void *) ioBase, port); + } + +-#elif defined(__arm__) && defined(__linux__) ++#elif defined(__arm__) && defined(__GLIBC__) + + /* for Linux on ARM, we use the LIBC inx/outx routines */ + /* note that the appropriate setup via "ioperm" needs to be done */ |