cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

build the bundled/patched copy of qt as part of the main build, not in

Browse Source 
configure. reported by espie@, ok Francisco de Borja Lopez Rio (maintainer)
This commit is contained in:
sthen 2014-01-15 08:41:37 +00:00
parent 1aa04a2499
commit 8b4a77b108
2 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
www/phantomjs/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.2 2014/01/11 11:47:20 sthen Exp $ # $OpenBSD: Makefile,v 1.3 2014/01/15 08:41:37 sthen Exp $
ONLY_FOR_ARCHS = i386 amd64 ONLY_FOR_ARCHS = i386 amd64
DPB_PROPERTIES = parallel nojunk DPB_PROPERTIES = parallel nojunk
@ -29,15 +29,17 @@ MAKE_ENV = C_INCLUDE_PATH=${X11BASE}/include/ \
MAKEFLAGS="-j${MAKE_JOBS}" \ MAKEFLAGS="-j${MAKE_JOBS}" \
OSTYPE="openbsd" OSTYPE="openbsd"
# Passed via environment rather than on the command line to make
PARALLEL_BUILD = No
do-configure: do-configure:
perl -pi -e 's,^#!/usr/bin/env bash,#!${LOCALBASE}/bin/bash,g' \ perl -pi -e 's,^#!/usr/bin/env bash,#!${LOCALBASE}/bin/bash,g' \
${WRKSRC}/src/qt/preconfig.sh ${WRKSRC}/src/qt/preconfig.sh
@cd ${WRKSRC}/src/qt && env -i ${MAKE_ENV} \ cd ${WRKSRC}/src/qt && env -i ${MAKE_ENV} \
./preconfig.sh --jobs ${MAKE_JOBS} --qt-config ./preconfig.sh --jobs ${MAKE_JOBS} --qt-config
@cd ${WRKSRC} && env -i ${MAKE_ENV} ./src/qt/bin/qmake
pre-build:
cd ${WRKSRC}/src/qt && env -i ${MAKE_ENV} ${MAKE} -j${MAKE_JOBS}
cd ${WRKSRC}/src/qt/src/plugins/codecs && \
env -i ${MAKE_ENV} ${MAKE} -j${MAKE_JOBS}
cd ${WRKSRC} && env -i ${MAKE_ENV} ./src/qt/bin/qmake
do-install: do-install:
${INSTALL_PROGRAM} ${WRKSRC}/bin/phantomjs ${PREFIX}/bin/phantomjs ${INSTALL_PROGRAM} ${WRKSRC}/bin/phantomjs ${PREFIX}/bin/phantomjs

13
www/phantomjs/patches/patch-src_qt_preconfig_sh Normal file
View File

@ -0,0 +1,13 @@
$OpenBSD: patch-src_qt_preconfig_sh,v 1.1 2014/01/15 08:41:37 sthen Exp $
--- src/qt/preconfig.sh.orig Sat Jan 11 22:14:23 2014
+++ src/qt/preconfig.sh Sat Jan 11 22:14:43 2014
@@ -107,9 +107,3 @@ done
export MAKEFLAGS=-j$COMPILE_JOBS
./configure -prefix $PWD $QT_CFG
-make -j$COMPILE_JOBS
-
-# Build text codecs
-pushd src/plugins/codecs/
-make -j$COMPILE_JOBS
-popd