moritzruth/void-packages
1
0
Fork 0
Code Releases Activity Actions 2

qt5-webkit: fix cross + clean up

Browse source 
Don't use build style qmake, but override do_configure, do_build and
do_install in the template. Switch to out-of-source-tree build and
add missing makedepends libjpeg-turbo-devel.
This commit is contained in:
Jürgen Buchmüller 2017-03-06 21:17:32 +01:00
parent 8ab4b77eed
commit 1272e255e2
1 changed files with 23 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

35
srcpkgs/qt5-webkit/template
View file

@ -1,12 +1,10 @@
# Template file for 'qt5-webkit' # Template file for 'qt5-webkit'
pkgname=qt5-webkit pkgname=qt5-webkit
version=5.8.0 version=5.8.0
revision=1 revision=2
build_style=qmake
wrksrc=qtwebkit-opensource-src-${version} wrksrc=qtwebkit-opensource-src-${version}
hostmakedepends="bison flex gperf perl python ruby pkg-config hostmakedepends="bison flex gperf perl python ruby pkg-config"
qt5-host-tools qt5-declarative-devel" makedepends="libwebp-devel libxslt-devel libXcomposite-devel sqlite-devel libjpeg-turbo-devel
makedepends="libwebp-devel libxslt-devel libXcomposite-devel sqlite-devel
gst-plugins-base1-devel qt5-declarative-devel qt5-location-devel gst-plugins-base1-devel qt5-declarative-devel qt5-location-devel
qt5-sensors-devel qt5-webchannel-devel" qt5-sensors-devel qt5-webchannel-devel"
short_desc="A cross-platform application and UI framework (Qt5) - WebKit2 component" short_desc="A cross-platform application and UI framework (Qt5) - WebKit2 component"
@ -16,18 +14,31 @@ homepage="https://www.qt.io/"
distfiles="https://download.qt.io/community_releases/${version%.*}/${version}-final/qtwebkit-opensource-src-${version}.tar.xz" distfiles="https://download.qt.io/community_releases/${version%.*}/${version}-final/qtwebkit-opensource-src-${version}.tar.xz"
checksum=79ae8660086bf92ffb0008b17566270e6477c8fa0daf9bb3ac29404fb5911bec checksum=79ae8660086bf92ffb0008b17566270e6477c8fa0daf9bb3ac29404fb5911bec
CXXFLAGS="-fno-delete-null-pointer-checks" CXXFLAGS="-std=c++11 -fno-delete-null-pointer-checks"
LDFLAGS="-ldl"
if [ -n "$CROSS_BUILD" ]; then if [ -n "$CROSS_BUILD" ]; then
# Can't use gold linker when cross compiling hostmakedepends+=" qt5-host-tools qt5-declarative-devel libjpeg-turbo-devel"
configure_args+=" QMAKE_LFLAGS_USE_GOLD="
fi fi
pre_configure() { do_configure() {
mkdir -p build
cd build
# Generate headers # Generate headers
syncqt.pl-qt5 -version ${version} Source/sync.profile syncqt.pl-qt5 -version ${version} ${wrksrc}/Source/sync.profile
# Patch for QtWebProcess LFLAGS
sed -i ${wrksrc}/Source/WebKit2/WebProcess.pro \
-e"/TARGET = QtWebProcess/i QMAKE_LFLAGS = $LDFLAGS"
qmake PREFIX=/usr LIB=/usr/lib QMAKE_LFLAGS_USE_GOLD= ${wrksrc}
} }
post_install() { do_build() {
# QMAKE_PRL_BUILD_DIR contains a reference the build dir; drop it cd build
make ${makejobs} CC=$CC CXX=$CXX LINK=$CXX LD=$CXX \
AR="$AR cru" RANLIB=$RANLIB
}
do_install() {
cd build
make PREFIX=/usr INSTALL_ROOT=${DESTDIR} install
# QMAKE_PRL_BUILD_DIR contains a reference to the build dir; drop it
find ${DESTDIR}/usr/lib -type f -name '*.prl' -exec \ find ${DESTDIR}/usr/lib -type f -name '*.prl' -exec \
sed -i "{}" -e "/^QMAKE_PRL_BUILD_DIR/d" \; sed -i "{}" -e "/^QMAKE_PRL_BUILD_DIR/d" \;
} }