Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] qt5-webkit: Fix building on ppc
@ 2019-05-31  2:51 voidlinux-github
  2019-05-31 11:03 ` voidlinux-github
                   ` (6 more replies)
  0 siblings, 7 replies; 8+ messages in thread
From: voidlinux-github @ 2019-05-31  2:51 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 443 bytes --]

There is a new pull request by stenstorp against master on the void-packages repository

https://github.com/stenstorp/void-packages qt5-webkit
https://github.com/void-linux/void-packages/pull/12049

qt5-webkit: Fix building on ppc
Cmake expects CMAKE_SYSTEM_PROCESSOR to be set to "ppc" when it should be "powerpc".
Also use -latomic and disable JIT.

A patch file from https://github.com/void-linux/void-packages/pull/12049.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-qt5-webkit-12049.patch --]
[-- Type: application/text/x-diff, Size: 1321 bytes --]

From 62f8bfd342d2d8b21288b506585971b90c199435 Mon Sep 17 00:00:00 2001
From: Thomas Batten <stenstorpmc@gmail.com>
Date: Fri, 31 May 2019 12:16:12 +0930
Subject: [PATCH] qt5-webkit: Fix building on ppc

---
 srcpkgs/qt5-webkit/template | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/qt5-webkit/template b/srcpkgs/qt5-webkit/template
index 3c570cf4b27..788bda2d42d 100644
--- a/srcpkgs/qt5-webkit/template
+++ b/srcpkgs/qt5-webkit/template
@@ -34,9 +34,14 @@ case "$XBPS_TARGET_MACHINE" in
 	ppc64*)	# no JIT on ppc64 and other build workarounds
 		configure_args+=" -DENABLE_JIT=OFF -DUSE_SYSTEM_MALLOC=ON"
 		;;
-	i686*) 	# try to reduce memory footprint when linking
+	i686*)  # try to reduce memory footprint when linking
 		nodebug=1
 		;;
+	ppc*)   # no JIT on ppc and need libatomic
+                configure_args+=" -DENABLE_JIT=OFF -DUSE_SYSTEM_MALLOC=ON"
+                makedepends+=" libatomic-devel"
+                LIBS+=" -latomic"
+                ;;
 esac
 
 pre_configure() {
@@ -45,6 +50,7 @@ pre_configure() {
 		sed -i Source/cmake/OptionsQt.cmake \
 			-e 's;check_cxx_source_compiles("${INCLUDE_TEST_SOURCE}" \(Qt5${_qt_component}_PRIVATE_HEADER_FOUND\));set(\1 1);'
 	fi
+	sed -i CMakeLists.txt -e 's/\"ppc\"/\"powerpc\"/g'
 }
 
 qt5-webkit-devel_package() {

^ permalink raw reply	[flat|nested] 8+ messages in thread
end of thread, other threads:[~2019-06-01  7:14 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-05-31  2:51 [PR PATCH] qt5-webkit: Fix building on ppc voidlinux-github
2019-05-31 11:03 ` voidlinux-github
2019-05-31 16:59 ` voidlinux-github
2019-05-31 17:03 ` voidlinux-github
2019-05-31 17:28 ` voidlinux-github
2019-05-31 23:08 ` [PR PATCH] [Updated] " voidlinux-github
2019-05-31 23:08 ` voidlinux-github
2019-06-01  7:14 ` [PR PATCH] [Merged]: " voidlinux-github

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).