build the bundled/patched copy of qt as part of the main build, not in
configure. reported by espie@, ok Francisco de Borja Lopez Rio (maintainer)
This commit is contained in:
parent
1aa04a2499
commit
8b4a77b108
@ -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
|
||||
DPB_PROPERTIES = parallel nojunk
|
||||
@ -29,15 +29,17 @@ MAKE_ENV = C_INCLUDE_PATH=${X11BASE}/include/ \
|
||||
MAKEFLAGS="-j${MAKE_JOBS}" \
|
||||
OSTYPE="openbsd"
|
||||
|
||||
# Passed via environment rather than on the command line to make
|
||||
PARALLEL_BUILD = No
|
||||
|
||||
do-configure:
|
||||
perl -pi -e 's,^#!/usr/bin/env bash,#!${LOCALBASE}/bin/bash,g' \
|
||||
${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
|
||||
@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:
|
||||
${INSTALL_PROGRAM} ${WRKSRC}/bin/phantomjs ${PREFIX}/bin/phantomjs
|
||||
|
13
www/phantomjs/patches/patch-src_qt_preconfig_sh
Normal file
13
www/phantomjs/patches/patch-src_qt_preconfig_sh
Normal 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
|
Loading…
Reference in New Issue
Block a user