From 2ecf221b74e05e126380e569a4363cfb75adbc4c Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Sun, 6 May 2018 20:21:44 +0200 Subject: [PATCH] Fix name of libWebKit for newer releases. Yes, we're now officially using "legacy" WebKit! --- build/jam/BuildFeatures | 30 +++++++++++++++++++++--------- 1 file changed, 21 insertions(+), 9 deletions(-) diff --git a/build/jam/BuildFeatures b/build/jam/BuildFeatures index 8573fd0413..af20a1510c 100644 --- a/build/jam/BuildFeatures +++ b/build/jam/BuildFeatures @@ -388,15 +388,27 @@ if $(HAIKU_BUILD_FEATURE_TAGLIB) { # WebKit if [ IsPackageAvailable haikuwebkit_devel ] { - ExtractBuildFeatureArchives webkit : - file: base haikuwebkit - runtime: lib - file: devel haikuwebkit_devel - depends: base - libraries: - $(developLibDir)/libWebKit.so - headers: $(developHeadersDir) - ; + if $(TARGET_PACKAGING_ARCH) = x86_64 { + ExtractBuildFeatureArchives webkit : + file: base haikuwebkit + runtime: lib + file: devel haikuwebkit_devel + depends: base + libraries: + $(developLibDir)/libWebKit.so + headers: $(developHeadersDir) + ; + } else { + ExtractBuildFeatureArchives webkit : + file: base haikuwebkit + runtime: lib + file: devel haikuwebkit_devel + depends: base + libraries: + $(developLibDir)/libWebKitLegacy.so + headers: $(developHeadersDir) + ; + } EnableBuildFeatures webkit ; } else {