diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2019-06-12 10:00:57 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2019-06-12 10:01:11 +0000 |
| commit | 5bdae676ba313c3402b64ffe6f379c5b43019998 (patch) | |
| tree | 24412a7b21160601a9acb14593abff74ee1d1863 | |
| parent | fdbd8eeac04703fb212d6d33758231dc926c8fae (diff) | |
community/virtualbox-guest-additions: fix build
| -rw-r--r-- | community/virtualbox-guest-additions/APKBUILD | 2 | ||||
| -rw-r--r-- | community/virtualbox-guest-additions/musl-off_t.patch | 26 |
2 files changed, 28 insertions, 0 deletions
diff --git a/community/virtualbox-guest-additions/APKBUILD b/community/virtualbox-guest-additions/APKBUILD index 378e1b794c2..7ba36cdf47d 100644 --- a/community/virtualbox-guest-additions/APKBUILD +++ b/community/virtualbox-guest-additions/APKBUILD @@ -18,6 +18,7 @@ source="https://download.virtualbox.org/virtualbox/$pkgver/VirtualBox-$pkgver.ta musl-no-glibc.patch musl-fix-stat-nsec.patch musl-sched_yield.patch + musl-off_t.patch glibc-symvers.patch VBoxClient.patch virtualbox-guest-additions-localconfig @@ -63,6 +64,7 @@ sha512sums="df18d5df2c82761b8a77e509b2873cdeaa46d11bc50ca166af1e6c30d3042b0cf564 b1c47cb910ac751df7bd4bc10c5501e91d88a9b3e4fe181b02755d433df8e89a160a38422912266f0cc51ba0c09854dad513ba6f2634fc76c59cee7989b259eb musl-no-glibc.patch 2c329085915f0ffa43828a14d8b29d0d876e48e18a0190ad146cd0731af7eca11cdf41d2e533c9cc73aa75506b9b91e3a08f2272cd8884e0d929722730b99862 musl-fix-stat-nsec.patch 56c5c3a0becd8f1886010f5f231aa1d2e129bf188f8220e111fb9d51c191a429940edec700f5286b46dadbb45b62e67ee4e09fec6bcea61a344fb65afcbd6756 musl-sched_yield.patch +09a0b5643e5c7d9e878131c5eb5abdec4f3e0626e1e7407dcbe9b295c8f0df972a4f3d43d8c3e99ff4f71d5ae4d5fa37e6cae516a780de384778fee71dfdcb26 musl-off_t.patch 2b907920c32b4385e80b81ec755cb0931d3bb1dff23184ddc49e457f9dfafb2ddbd810418c003c3be82433b06de800fce77a07883fa46e51e6870d565a485add glibc-symvers.patch 9e2da29de4767e1276fb11191641a4f0ecc133a2113b5dd3cc9e17e59cabd8f192d118680d014641b3cd819d6d6faefbf298c1f0891426e261a9b8a8c69c2c52 VBoxClient.patch 05aac36598cda11940a95c72045be78ec0fbcdfe95b7bd390229a85fb576ccfb6b5adcb479b361fa56755bea62deba4112b997c802d230c5f011c5a67e0c8f91 virtualbox-guest-additions-localconfig diff --git a/community/virtualbox-guest-additions/musl-off_t.patch b/community/virtualbox-guest-additions/musl-off_t.patch new file mode 100644 index 00000000000..ba3f4af58f5 --- /dev/null +++ b/community/virtualbox-guest-additions/musl-off_t.patch @@ -0,0 +1,26 @@ +diff --git a/src/VBox/Runtime/r3/linux/RTFileCopyPartEx-linux.cpp b/src/VBox/Runtime/r3/linux/RTFileCopyPartEx-linux.cpp +index 69cc3da..c58cb59 100644 +--- a/src/VBox/Runtime/r3/linux/RTFileCopyPartEx-linux.cpp ++++ b/src/VBox/Runtime/r3/linux/RTFileCopyPartEx-linux.cpp +@@ -63,8 +63,8 @@ + static int32_t volatile g_fCopyFileRangeSupported = -1; + + +-DECLINLINE(loff_t) +-MyCopyFileRangeSysCall(int fdIn, loff_t *poffIn, int fdOut, loff_t *poffOut, size_t cbChunk, unsigned int fFlags) ++DECLINLINE(off_t) ++MyCopyFileRangeSysCall(int fdIn, off_t *poffIn, int fdOut, off_t *poffOut, size_t cbChunk, unsigned int fFlags) + { + return syscall(__NR_copy_file_range, fdIn, poffIn, fdOut, poffOut, cbChunk, fFlags); + } +@@ -144,8 +144,8 @@ RTDECL(int) RTFileCopyPartEx(RTFILE hFileSrc, RTFOFF offSrc, RTFILE hFileDst, RT + do + { + size_t cbThisCopy = (size_t)RT_MIN(cbToCopy - cbCopied, _1G); +- loff_t offThisDst = offSrc + cbCopied; +- loff_t offThisSrc = offDst + cbCopied; ++ off_t offThisDst = offSrc + cbCopied; ++ off_t offThisSrc = offDst + cbCopied; + ssize_t cbActual = MyCopyFileRangeSysCall((int)RTFileToNative(hFileSrc), &offThisSrc, + (int)RTFileToNative(hFileDst), &offThisDst, + cbThisCopy, 0); |