From owner-svn-ports-all@freebsd.org Fri Aug 18 10:14:55 2017 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 6057DDD6CA7; Fri, 18 Aug 2017 10:14:55 +0000 (UTC) (envelope-from tcberner@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 2C5F77FC16; Fri, 18 Aug 2017 10:14:55 +0000 (UTC) (envelope-from tcberner@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v7IAEs6m060935; Fri, 18 Aug 2017 10:14:54 GMT (envelope-from tcberner@FreeBSD.org) Received: (from tcberner@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v7IAEs4d060934; Fri, 18 Aug 2017 10:14:54 GMT (envelope-from tcberner@FreeBSD.org) Message-Id: <201708181014.v7IAEs4d060934@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tcberner set sender to tcberner@FreeBSD.org using -f From: "Tobias C. Berner" Date: Fri, 18 Aug 2017 10:14:54 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r448215 - head/www/qt5-webengine X-SVN-Group: ports-head X-SVN-Commit-Author: tcberner X-SVN-Commit-Paths: head/www/qt5-webengine X-SVN-Commit-Revision: 448215 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 Aug 2017 10:14:55 -0000 Author: tcberner Date: Fri Aug 18 10:14:54 2017 New Revision: 448215 URL: https://svnweb.freebsd.org/changeset/ports/448215 Log: Fix building of www/qt5-webengine if the default python version is not 2. Reviewed by: rakuco Modified: head/www/qt5-webengine/Makefile Modified: head/www/qt5-webengine/Makefile ============================================================================== --- head/www/qt5-webengine/Makefile Fri Aug 18 09:23:45 2017 (r448214) +++ head/www/qt5-webengine/Makefile Fri Aug 18 10:14:54 2017 (r448215) @@ -16,6 +16,7 @@ PORTNAME= webengine DISTVERSION= ${QT5_VERSION} +PORTREVISION= 1 CATEGORIES= www PKGNAMEPREFIX= qt5- @@ -24,7 +25,6 @@ COMMENT= Qt 5 library to render web content BUILD_DEPENDS= bison:devel/bison \ ninja:devel/ninja \ - python:lang/python \ yasm:devel/yasm \ ${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat LIB_DEPENDS= libdbus-1.so:devel/dbus \ @@ -83,7 +83,8 @@ ALL_TARGET= first # Since we use USES=qmake:norecursive, we also need to pass some variables to # MAKE_ENV because part of the configuration process happens during the build. CONFIGURE_ENV+= NINJAFLAGS="-j${MAKE_JOBS_NUMBER}" \ - NINJA_PATH="${LOCALBASE}/bin/ninja" + NINJA_PATH="${LOCALBASE}/bin/ninja" \ + PATH=${CONFIGURE_WRKSRC}/bin:${PATH} MAKE_ENV+= CC="${CC}" CXX="${CXX}" ${CONFIGURE_ENV} post-extract: @@ -101,5 +102,11 @@ post-patch: # Too many occurrences to keep in a patch in files/. ${REINPLACE_CMD} -e 's,OS == "linux",(OS == "linux" or OS == "freebsd"),g' \ ${WRKSRC}/src/3rdparty/chromium/third_party/ffmpeg/ffmpeg_generated.gypi + +pre-configure: +# Link in ${PYTHON_CMD} to ${CONFIGURE_WRKSRC}/bin -- the scripts hardcode 'python' +# in too many places to reasonably patch. So just link in ${PYTHON_CMD} to work around +# $LOCALBASE/bin/python being python3 if the default versions is set to 3.x. + ${MKDIR} ${CONFIGURE_WRKSRC}/bin && ${LN} -s ${PYTHON_CMD} ${CONFIGURE_WRKSRC}/bin/python .include