Skip to content

Commit

Permalink
another stab at fixing the build of devel/pyside2
Browse files Browse the repository at this point in the history
the QtWebEngineWidgets submodule depends on the QtWebEngineCore submodule,
but that internal dependency wasn't reflected in the CMakeLists.


git-svn-id: svn+ssh://svn.freebsd.org/ports/head@501963 35697150-7ecd-e111-bb59-0022644237b5
  • Loading branch information
moench-tegeder committed May 18, 2019
1 parent ff8ae89 commit a1fe435
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 3 deletions.
2 changes: 0 additions & 2 deletions devel/pyside2/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,6 @@ USE_QT= 3d buildtools_build charts core datavis3d declarative \
CMAKE_ARGS+= "-DUSE_PYTHON_VERSION=${PYTHON_VER}" \
"-DPYTHON_EXECUTABLE=${PYTHON_CMD}"

MAKE_JOBS_UNSAFE= yes

.include <bsd.port.pre.mk>

.if ${PYTHON_MAJOR_VER} >= 3
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# keep this - else the build fails on the package cluster
# see http://beefy5.nyi.freebsd.org/data/120i386-default/498628/logs/py27-pyside2-5.12.2.log
# I cannot reproduce the failure locally -- cmt
--- PySide2/QtWebEngineWidgets/CMakeLists.txt.orig 2019-04-12 15:25:16 UTC
--- PySide2/QtWebEngineWidgets/CMakeLists.txt.orig 2019-03-21 14:37:54 UTC
+++ PySide2/QtWebEngineWidgets/CMakeLists.txt
@@ -25,6 +25,7 @@ set(QtWebEngineWidgets_include_dirs
${Qt5Widgets_INCLUDE_DIRS}
Expand All @@ -11,3 +11,12 @@
${Qt5WebEngineWidgets_INCLUDE_DIRS}
${libpyside_SOURCE_DIR}
${QtCore_GEN_DIR}
@@ -45,7 +46,7 @@ set(QtWebEngineWidgets_libraries pyside2
${Qt5Core_LIBRARIES}
${Qt5PrintSupport_LIBRARIES}
)
-set(QtWebEngineWidgets_deps QtGui QtWidgets QtNetwork QtWebChannel QtPrintSupport)
+set(QtWebEngineWidgets_deps QtGui QtWidgets QtNetwork QtWebChannel QtPrintSupport QtWebEngineCore)
create_pyside_module(NAME QtWebEngineWidgets
INCLUDE_DIRS QtWebEngineWidgets_include_dirs
LIBRARIES QtWebEngineWidgets_libraries

0 comments on commit a1fe435

Please sign in to comment.