[PR PATCH] python-PyQt5: fix cross build

[PR PATCH] python-PyQt5: fix cross build

[voidlinux-github]

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

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

https://github.com/pbui/void-packages python-PyQt5
https://github.com/void-linux/void-packages/pull/13195

python-PyQt5: fix cross build
This fixes cross building by modifying the explicit library paths to Qt5 shared libraries to include the XBPS_CROSS_BASE.

Tested by cross building armv7l and armv7l-musl.

[ci skip]

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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-python-PyQt5-13195.patch --]
[-- Type: application/text/x-diff, Size: 1442 bytes --]

From 66f40f73ed6f5131f49cc5f687fa717ba6b19495 Mon Sep 17 00:00:00 2001
From: Peter Bui <pbui@github.bx612.space>
Date: Wed, 17 Jul 2019 17:59:37 -0400
Subject: [PATCH] python-PyQt5: fix cross build

[ci skip]
---
 srcpkgs/python-PyQt5/template | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/python-PyQt5/template b/srcpkgs/python-PyQt5/template
index 82923580246..6534d4e22e6 100644
--- a/srcpkgs/python-PyQt5/template
+++ b/srcpkgs/python-PyQt5/template
@@ -21,7 +21,6 @@ homepage="https://riverbankcomputing.com/software/pyqt/intro"
 license="GPL-3.0-only"
 distfiles="https://www.riverbankcomputing.com/static/Downloads/PyQt5/${version}/PyQt5_gpl-${version}.tar.gz"
 checksum=0cdbffe5135926527b61cc3692dd301cd0328dd87eeaf1313e610787c46faff9
-nocross="https://build.voidlinux.org/builders/armv7l_builder/builds/18963/steps/shell_3/logs/stdio"
 
 pre_build() {
 	mkdir -p pyqt5-${py2_ver}
@@ -65,6 +64,12 @@ EOF
 		python${pyver} configure.py --confirm-license --assume-shared --no-dist-info $_sysroot $_configuration \
 			QMAKE_CC="${CC}" QMAKE_CFLAGS="${CFLAGS}" QMAKE_CXX="${CXX}" QMAKE_CXXFLAGS="${CXXFLAGS}" \
 			QMAKE_LINK="${CXX}" QMAKE_LINK_SHLIB="${CXX}" QMAKE_LFLAGS="${LDFLAGS}" QMAKE_STRIP=""
+
+		if [ "$CROSS_BUILD" ]; then
+			# Fix location of libraries
+			find . -name Makefile | xargs sed -i -E "s|(/usr/lib/libQt5[^ ]+so)|${XBPS_CROSS_BASE}\1|g"
+		fi
+
 		make ${makejobs}
 	done
 }

Re: [PR PATCH] [Merged]: python-PyQt5: fix cross build

[voidlinux-github]

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

There's a merged pull request on the void-packages repository

python-PyQt5: fix cross build
https://github.com/void-linux/void-packages/pull/13195
Description: This fixes cross building by modifying the explicit library paths to Qt5 shared libraries to include the XBPS_CROSS_BASE.

Tested by cross building armv7l and armv7l-musl.

[ci skip]