summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO2
-rw-r--r--0006-LoL-abi-vsyscall32-disable-vDSO.patch13
-rw-r--r--PKGBUILD8
3 files changed, 22 insertions, 1 deletions
diff --git a/.SRCINFO b/.SRCINFO
index a5d52f23e8ee..d4502a544bcd 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -159,11 +159,13 @@ pkgbase = wine-lol-staging
source = 0003-LoL-abi.vsyscall32-alternative_patch_by_using_a_fake_cs_segment.patch
source = 0004-LoL-broken-client-update-fix.patch
source = 0005-LoL-client-slow-start-fix.patch
+ source = 0006-LoL-abi-vsyscall32-disable-vDSO.patch
sha256sums = SKIP
sha256sums = SKIP
sha256sums = c127907db75cd8575da27198c8f46aa19dd2a219324e7491761f206f3ce91601
sha256sums = c2cb9265567dfe8c9f148e237910792cad7666d9d3cbf68d8717076030cddc92
sha256sums = 0c5b97c64fd4983119db8675f0686e26143898de1566c4da46d5df74cb98cfb2
sha256sums = 49dfbf7546c00958e2b426a61371eedf0119471e9998b354595d5c0ce6dab48b
+ sha256sums = fe33c51d492de4685b515781ac157a5d02f8048a528404b4fd8319cfc7f5cf25
pkgname = wine-lol-staging
diff --git a/0006-LoL-abi-vsyscall32-disable-vDSO.patch b/0006-LoL-abi-vsyscall32-disable-vDSO.patch
new file mode 100644
index 000000000000..33c993a82382
--- /dev/null
+++ b/0006-LoL-abi-vsyscall32-disable-vDSO.patch
@@ -0,0 +1,13 @@
+diff --git a/loader/preloader.c b/loader/preloader.c
+index d88964e9c4b..1ac8b9bd16b 100644
+--- a/loader/preloader.c
++++ b/loader/preloader.c
+@@ -1460,7 +1460,7 @@ void* wld_start( void **stack )
+
+ i = 0;
+ /* delete sysinfo values if addresses conflict */
+- if (is_in_preload_range( av, AT_SYSINFO ) || is_in_preload_range( av, AT_SYSINFO_EHDR ))
++ if (1)
+ {
+ delete_av[i++].a_type = AT_SYSINFO;
+ delete_av[i++].a_type = AT_SYSINFO_EHDR;
diff --git a/PKGBUILD b/PKGBUILD
index bb1976b715d6..fc30790261b3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -17,6 +17,7 @@ source=("git+https://github.com/wine-staging/wine-staging.git#tag=v${pkgver}"
"0003-LoL-abi.vsyscall32-alternative_patch_by_using_a_fake_cs_segment.patch"
"0004-LoL-broken-client-update-fix.patch"
"0005-LoL-client-slow-start-fix.patch"
+ "0006-LoL-abi-vsyscall32-disable-vDSO.patch"
)
sha256sums=('SKIP'
@@ -25,6 +26,7 @@ sha256sums=('SKIP'
'c2cb9265567dfe8c9f148e237910792cad7666d9d3cbf68d8717076030cddc92'
'0c5b97c64fd4983119db8675f0686e26143898de1566c4da46d5df74cb98cfb2'
'49dfbf7546c00958e2b426a61371eedf0119471e9998b354595d5c0ce6dab48b'
+ 'fe33c51d492de4685b515781ac157a5d02f8048a528404b4fd8319cfc7f5cf25'
)
depends=(
@@ -153,6 +155,10 @@ prepare() {
# Hack for league to start in reasonable time
printf 'Apply 0005-LoL-client-slow-start-fix.patch\n'
patch -Np1 < "${srcdir}/0005-LoL-client-slow-start-fix.patch"
+
+ # Disables vDSO in preelink, no need for "sudo sysctl -w abi.vsyscall32=0"
+ printf 'Apply 0006-LoL-abi-vsyscall32-disable-vDSO.patch\n'
+ patch -Np1 < "${srcdir}/0006-LoL-abi-vsyscall32-disable-vDSO.patch"
}
build() {
@@ -174,7 +180,7 @@ build() {
--disable-tests \
--disable-winemenubuilder \
--disable-win16
- make -j12
+ make -j`nproc`
}
package() {