From f3e9a3b3c81cb533d87b42b96cce4d5eee20c088 Mon Sep 17 00:00:00 2001 From: Yuri Victorovich Date: Sat, 25 Dec 2021 23:03:53 -0800 Subject: [PATCH] cad/klayout: Unbreak build It wasn't finding the library in the build directory. Also add the missing USE_QT element and fix plist. Approved by: portmgr (unbreak) --- cad/klayout/Makefile | 4 +- cad/klayout/pkg-plist | 290 ++++++++++++++++++++++-------------------- 2 files changed, 152 insertions(+), 142 deletions(-) diff --git a/cad/klayout/Makefile b/cad/klayout/Makefile index e513a94a6c1d..ef8869016fec 100644 --- a/cad/klayout/Makefile +++ b/cad/klayout/Makefile @@ -1,5 +1,6 @@ PORTNAME= klayout PORTVERSION= 0.27.3 +PORTREVISION= 1 DISTVERSIONPREFIX= v CATEGORIES= cad @@ -18,13 +19,14 @@ GH_ACCOUNT= KLayout USE_GL= gl USE_RUBY= yes USE_QT= core buildtools designer gui multimedia network printsupport \ - qmake sql svg testlib widgets xml xmlpatterns + qmake sql svg testlib uitools widgets xml xmlpatterns USE_LDCONFIG= yes CXXFLAGS+= -fPIC -I${LOCALBASE}/include/qt5 \ ${QT5MODULES:S,^,-I${LOCALBASE}/include/qt5/Qt,} LDFLAGS+= ${LIBS} ${QT5MODULES:S,^,-lQt5,} \ -L${LOCALBASE}/lib/qt5 -lpthread +LDFLAGS+= -L${BUILD_WRKSRC} # workaround for the error: unable to find library -lklayout_lib: https://github.com/KLayout/klayout/issues/955 QT5MODULES= Core Designer Gui Multimedia MultimediaWidgets \ Network PrintSupport Sql Svg Test Widgets Xml XmlPatterns MAKE_ENV= INSTALLROOT=${STAGEDIR} \ diff --git a/cad/klayout/pkg-plist b/cad/klayout/pkg-plist index 8f76a2e55465..c0dfa72a9b59 100644 --- a/cad/klayout/pkg-plist +++ b/cad/klayout/pkg-plist @@ -98,139 +98,6 @@ lib/klayout/lay_plugins/libxor_ui.so lib/klayout/lay_plugins/libxor_ui.so.0 lib/klayout/lay_plugins/libxor_ui.so.0.27 lib/klayout/lay_plugins/libxor_ui.so.0.27.3 -@dir lib/klayout/lay_plugins -lib/klayout/libbridge_mod.so -lib/klayout/libbridge_mod.so.1 -lib/klayout/libbridge_mod.so.1.0 -lib/klayout/libbridge_mod.so.1.0.0 -lib/klayout/libdbcore.so -lib/klayout/libdbcore.so.0 -lib/klayout/libdbcore.so.0.27 -lib/klayout/libdbcore.so.0.27.3 -lib/klayout/libklayout_ant.so -lib/klayout/libklayout_ant.so.0 -lib/klayout/libklayout_ant.so.0.27 -lib/klayout/libklayout_ant.so.0.27.3 -lib/klayout/libklayout_bd.so -lib/klayout/libklayout_bd.so.0 -lib/klayout/libklayout_bd.so.0.27 -lib/klayout/libklayout_bd.so.0.27.3 -lib/klayout/libklayout_db.so -lib/klayout/libklayout_db.so.0 -lib/klayout/libklayout_db.so.0.27 -lib/klayout/libklayout_db.so.0.27.3 -lib/klayout/libklayout_drc.so -lib/klayout/libklayout_drc.so.0 -lib/klayout/libklayout_drc.so.0.27 -lib/klayout/libklayout_drc.so.0.27.3 -lib/klayout/libklayout_edt.so -lib/klayout/libklayout_edt.so.0 -lib/klayout/libklayout_edt.so.0.27 -lib/klayout/libklayout_edt.so.0.27.3 -lib/klayout/libklayout_gsi_test.so -lib/klayout/libklayout_gsi_test.so.0 -lib/klayout/libklayout_gsi_test.so.0.27 -lib/klayout/libklayout_gsi_test.so.0.27.3 -lib/klayout/libklayout_gsi.so -lib/klayout/libklayout_gsi.so.0 -lib/klayout/libklayout_gsi.so.0.27 -lib/klayout/libklayout_gsi.so.0.27.3 -lib/klayout/libklayout_img.so -lib/klayout/libklayout_img.so.0 -lib/klayout/libklayout_img.so.0.27 -lib/klayout/libklayout_img.so.0.27.3 -lib/klayout/libklayout_lay.so -lib/klayout/libklayout_lay.so.0 -lib/klayout/libklayout_lay.so.0.27 -lib/klayout/libklayout_lay.so.0.27.3 -lib/klayout/libklayout_laybasic.so -lib/klayout/libklayout_laybasic.so.0 -lib/klayout/libklayout_laybasic.so.0.27 -lib/klayout/libklayout_laybasic.so.0.27.3 -lib/klayout/libklayout_lib.so -lib/klayout/libklayout_lib.so.0 -lib/klayout/libklayout_lib.so.0.27 -lib/klayout/libklayout_lib.so.0.27.3 -lib/klayout/libklayout_lvs.so -lib/klayout/libklayout_lvs.so.0 -lib/klayout/libklayout_lvs.so.0.27 -lib/klayout/libklayout_lvs.so.0.27.3 -lib/klayout/libklayout_lym.so -lib/klayout/libklayout_lym.so.0 -lib/klayout/libklayout_lym.so.0.27 -lib/klayout/libklayout_lym.so.0.27.3 -lib/klayout/libklayout_pya.so -lib/klayout/libklayout_pya.so.0 -lib/klayout/libklayout_pya.so.0.27 -lib/klayout/libklayout_pya.so.0.27.3 -lib/klayout/libklayout_qtbasic.so -lib/klayout/libklayout_qtbasic.so.0 -lib/klayout/libklayout_qtbasic.so.0.27 -lib/klayout/libklayout_qtbasic.so.0.27.3 -lib/klayout/libklayout_QtCore.so -lib/klayout/libklayout_QtCore.so.0 -lib/klayout/libklayout_QtCore.so.0.27 -lib/klayout/libklayout_QtCore.so.0.27.3 -lib/klayout/libklayout_QtDesigner.so -lib/klayout/libklayout_QtDesigner.so.0 -lib/klayout/libklayout_QtDesigner.so.0.27 -lib/klayout/libklayout_QtDesigner.so.0.27.3 -lib/klayout/libklayout_QtGui.so -lib/klayout/libklayout_QtGui.so.0 -lib/klayout/libklayout_QtGui.so.0.27 -lib/klayout/libklayout_QtGui.so.0.27.3 -lib/klayout/libklayout_QtMultimedia.so -lib/klayout/libklayout_QtMultimedia.so.0 -lib/klayout/libklayout_QtMultimedia.so.0.27 -lib/klayout/libklayout_QtMultimedia.so.0.27.3 -lib/klayout/libklayout_QtNetwork.so -lib/klayout/libklayout_QtNetwork.so.0 -lib/klayout/libklayout_QtNetwork.so.0.27 -lib/klayout/libklayout_QtNetwork.so.0.27.3 -lib/klayout/libklayout_QtPrintSupport.so -lib/klayout/libklayout_QtPrintSupport.so.0 -lib/klayout/libklayout_QtPrintSupport.so.0.27 -lib/klayout/libklayout_QtPrintSupport.so.0.27.3 -lib/klayout/libklayout_QtSql.so -lib/klayout/libklayout_QtSql.so.0 -lib/klayout/libklayout_QtSql.so.0.27 -lib/klayout/libklayout_QtSql.so.0.27.3 -lib/klayout/libklayout_QtSvg.so -lib/klayout/libklayout_QtSvg.so.0 -lib/klayout/libklayout_QtSvg.so.0.27 -lib/klayout/libklayout_QtSvg.so.0.27.3 -lib/klayout/libklayout_QtWidgets.so -lib/klayout/libklayout_QtWidgets.so.0 -lib/klayout/libklayout_QtWidgets.so.0.27 -lib/klayout/libklayout_QtWidgets.so.0.27.3 -lib/klayout/libklayout_QtXml.so -lib/klayout/libklayout_QtXml.so.0 -lib/klayout/libklayout_QtXml.so.0.27 -lib/klayout/libklayout_QtXml.so.0.27.3 -lib/klayout/libklayout_QtXmlPatterns.so -lib/klayout/libklayout_QtXmlPatterns.so.0 -lib/klayout/libklayout_QtXmlPatterns.so.0.27 -lib/klayout/libklayout_QtXmlPatterns.so.0.27.3 -lib/klayout/libklayout_rba.so -lib/klayout/libklayout_rba.so.0 -lib/klayout/libklayout_rba.so.0.27 -lib/klayout/libklayout_rba.so.0.27.3 -lib/klayout/libklayout_rdb.so -lib/klayout/libklayout_rdb.so.0 -lib/klayout/libklayout_rdb.so.0.27 -lib/klayout/libklayout_rdb.so.0.27.3 -lib/klayout/libklayout_tl.so -lib/klayout/libklayout_tl.so.0 -lib/klayout/libklayout_tl.so.0.27 -lib/klayout/libklayout_tl.so.0.27.3 -lib/klayout/liblay.so -lib/klayout/liblay.so.0 -lib/klayout/liblay.so.0.27 -lib/klayout/liblay.so.0.27.3 -lib/klayout/liblibcore.so -lib/klayout/liblibcore.so.0 -lib/klayout/liblibcore.so.0.27 -lib/klayout/liblibcore.so.0.27.3 lib/klayout/libQtCore.so lib/klayout/libQtCore.so.0 lib/klayout/libQtCore.so.0.27 @@ -263,6 +130,10 @@ lib/klayout/libQtSvg.so lib/klayout/libQtSvg.so.0 lib/klayout/libQtSvg.so.0.27 lib/klayout/libQtSvg.so.0.27.3 +lib/klayout/libQtUiTools.so +lib/klayout/libQtUiTools.so.0 +lib/klayout/libQtUiTools.so.0.27 +lib/klayout/libQtUiTools.so.0.27.3 lib/klayout/libQtWidgets.so lib/klayout/libQtWidgets.so.0 lib/klayout/libQtWidgets.so.0.27 @@ -275,6 +146,142 @@ lib/klayout/libQtXmlPatterns.so lib/klayout/libQtXmlPatterns.so.0 lib/klayout/libQtXmlPatterns.so.0.27 lib/klayout/libQtXmlPatterns.so.0.27.3 +lib/klayout/libbridge_mod.so +lib/klayout/libbridge_mod.so.1 +lib/klayout/libbridge_mod.so.1.0 +lib/klayout/libbridge_mod.so.1.0.0 +lib/klayout/libdbcore.so +lib/klayout/libdbcore.so.0 +lib/klayout/libdbcore.so.0.27 +lib/klayout/libdbcore.so.0.27.3 +lib/klayout/libklayout_QtCore.so +lib/klayout/libklayout_QtCore.so.0 +lib/klayout/libklayout_QtCore.so.0.27 +lib/klayout/libklayout_QtCore.so.0.27.3 +lib/klayout/libklayout_QtDesigner.so +lib/klayout/libklayout_QtDesigner.so.0 +lib/klayout/libklayout_QtDesigner.so.0.27 +lib/klayout/libklayout_QtDesigner.so.0.27.3 +lib/klayout/libklayout_QtGui.so +lib/klayout/libklayout_QtGui.so.0 +lib/klayout/libklayout_QtGui.so.0.27 +lib/klayout/libklayout_QtGui.so.0.27.3 +lib/klayout/libklayout_QtMultimedia.so +lib/klayout/libklayout_QtMultimedia.so.0 +lib/klayout/libklayout_QtMultimedia.so.0.27 +lib/klayout/libklayout_QtMultimedia.so.0.27.3 +lib/klayout/libklayout_QtNetwork.so +lib/klayout/libklayout_QtNetwork.so.0 +lib/klayout/libklayout_QtNetwork.so.0.27 +lib/klayout/libklayout_QtNetwork.so.0.27.3 +lib/klayout/libklayout_QtPrintSupport.so +lib/klayout/libklayout_QtPrintSupport.so.0 +lib/klayout/libklayout_QtPrintSupport.so.0.27 +lib/klayout/libklayout_QtPrintSupport.so.0.27.3 +lib/klayout/libklayout_QtSql.so +lib/klayout/libklayout_QtSql.so.0 +lib/klayout/libklayout_QtSql.so.0.27 +lib/klayout/libklayout_QtSql.so.0.27.3 +lib/klayout/libklayout_QtSvg.so +lib/klayout/libklayout_QtSvg.so.0 +lib/klayout/libklayout_QtSvg.so.0.27 +lib/klayout/libklayout_QtSvg.so.0.27.3 +lib/klayout/libklayout_QtUiTools.so +lib/klayout/libklayout_QtUiTools.so.0 +lib/klayout/libklayout_QtUiTools.so.0.27 +lib/klayout/libklayout_QtUiTools.so.0.27.3 +lib/klayout/libklayout_QtWidgets.so +lib/klayout/libklayout_QtWidgets.so.0 +lib/klayout/libklayout_QtWidgets.so.0.27 +lib/klayout/libklayout_QtWidgets.so.0.27.3 +lib/klayout/libklayout_QtXml.so +lib/klayout/libklayout_QtXml.so.0 +lib/klayout/libklayout_QtXml.so.0.27 +lib/klayout/libklayout_QtXml.so.0.27.3 +lib/klayout/libklayout_QtXmlPatterns.so +lib/klayout/libklayout_QtXmlPatterns.so.0 +lib/klayout/libklayout_QtXmlPatterns.so.0.27 +lib/klayout/libklayout_QtXmlPatterns.so.0.27.3 +lib/klayout/libklayout_ant.so +lib/klayout/libklayout_ant.so.0 +lib/klayout/libklayout_ant.so.0.27 +lib/klayout/libklayout_ant.so.0.27.3 +lib/klayout/libklayout_bd.so +lib/klayout/libklayout_bd.so.0 +lib/klayout/libklayout_bd.so.0.27 +lib/klayout/libklayout_bd.so.0.27.3 +lib/klayout/libklayout_db.so +lib/klayout/libklayout_db.so.0 +lib/klayout/libklayout_db.so.0.27 +lib/klayout/libklayout_db.so.0.27.3 +lib/klayout/libklayout_drc.so +lib/klayout/libklayout_drc.so.0 +lib/klayout/libklayout_drc.so.0.27 +lib/klayout/libklayout_drc.so.0.27.3 +lib/klayout/libklayout_edt.so +lib/klayout/libklayout_edt.so.0 +lib/klayout/libklayout_edt.so.0.27 +lib/klayout/libklayout_edt.so.0.27.3 +lib/klayout/libklayout_gsi.so +lib/klayout/libklayout_gsi.so.0 +lib/klayout/libklayout_gsi.so.0.27 +lib/klayout/libklayout_gsi.so.0.27.3 +lib/klayout/libklayout_gsi_test.so +lib/klayout/libklayout_gsi_test.so.0 +lib/klayout/libklayout_gsi_test.so.0.27 +lib/klayout/libklayout_gsi_test.so.0.27.3 +lib/klayout/libklayout_img.so +lib/klayout/libklayout_img.so.0 +lib/klayout/libklayout_img.so.0.27 +lib/klayout/libklayout_img.so.0.27.3 +lib/klayout/libklayout_lay.so +lib/klayout/libklayout_lay.so.0 +lib/klayout/libklayout_lay.so.0.27 +lib/klayout/libklayout_lay.so.0.27.3 +lib/klayout/libklayout_laybasic.so +lib/klayout/libklayout_laybasic.so.0 +lib/klayout/libklayout_laybasic.so.0.27 +lib/klayout/libklayout_laybasic.so.0.27.3 +lib/klayout/libklayout_lib.so +lib/klayout/libklayout_lib.so.0 +lib/klayout/libklayout_lib.so.0.27 +lib/klayout/libklayout_lib.so.0.27.3 +lib/klayout/libklayout_lvs.so +lib/klayout/libklayout_lvs.so.0 +lib/klayout/libklayout_lvs.so.0.27 +lib/klayout/libklayout_lvs.so.0.27.3 +lib/klayout/libklayout_lym.so +lib/klayout/libklayout_lym.so.0 +lib/klayout/libklayout_lym.so.0.27 +lib/klayout/libklayout_lym.so.0.27.3 +lib/klayout/libklayout_pya.so +lib/klayout/libklayout_pya.so.0 +lib/klayout/libklayout_pya.so.0.27 +lib/klayout/libklayout_pya.so.0.27.3 +lib/klayout/libklayout_qtbasic.so +lib/klayout/libklayout_qtbasic.so.0 +lib/klayout/libklayout_qtbasic.so.0.27 +lib/klayout/libklayout_qtbasic.so.0.27.3 +lib/klayout/libklayout_rba.so +lib/klayout/libklayout_rba.so.0 +lib/klayout/libklayout_rba.so.0.27 +lib/klayout/libklayout_rba.so.0.27.3 +lib/klayout/libklayout_rdb.so +lib/klayout/libklayout_rdb.so.0 +lib/klayout/libklayout_rdb.so.0.27 +lib/klayout/libklayout_rdb.so.0.27.3 +lib/klayout/libklayout_tl.so +lib/klayout/libklayout_tl.so.0 +lib/klayout/libklayout_tl.so.0.27 +lib/klayout/libklayout_tl.so.0.27.3 +lib/klayout/liblay.so +lib/klayout/liblay.so.0 +lib/klayout/liblay.so.0.27 +lib/klayout/liblay.so.0.27.3 +lib/klayout/liblibcore.so +lib/klayout/liblibcore.so.0 +lib/klayout/liblibcore.so.0.27 +lib/klayout/liblibcore.so.0.27.3 lib/klayout/librdbcore.so lib/klayout/librdbcore.so.0 lib/klayout/librdbcore.so.0.27 @@ -283,14 +290,6 @@ lib/klayout/libtlcore.so lib/klayout/libtlcore.so.0 lib/klayout/libtlcore.so.0.27 lib/klayout/libtlcore.so.0.27.3 -%%PYTHON_SITELIBDIR%%/klayout/__init__.py -%%PYTHON_SITELIBDIR%%/klayout/db/__init__.py -%%PYTHON_SITELIBDIR%%/klayout/db/pcell_declaration_helper.py -%%PYTHON_SITELIBDIR%%/klayout/dbcore%%PYTHON_EXT_SUFFIX%%.so -%%PYTHON_SITELIBDIR%%/klayout/lay%%PYTHON_EXT_SUFFIX%%.so -%%PYTHON_SITELIBDIR%%/klayout/lib/__init__.py -%%PYTHON_SITELIBDIR%%/klayout/libcore%%PYTHON_EXT_SUFFIX%%.so -%%PYTHON_SITELIBDIR%%/klayout/pya/__init__.py %%PYTHON_SITELIBDIR%%/klayout/QtCore%%PYTHON_EXT_SUFFIX%%.so %%PYTHON_SITELIBDIR%%/klayout/QtDesigner%%PYTHON_EXT_SUFFIX%%.so %%PYTHON_SITELIBDIR%%/klayout/QtGui%%PYTHON_EXT_SUFFIX%%.so @@ -299,9 +298,18 @@ lib/klayout/libtlcore.so.0.27.3 %%PYTHON_SITELIBDIR%%/klayout/QtPrintSupport%%PYTHON_EXT_SUFFIX%%.so %%PYTHON_SITELIBDIR%%/klayout/QtSql%%PYTHON_EXT_SUFFIX%%.so %%PYTHON_SITELIBDIR%%/klayout/QtSvg%%PYTHON_EXT_SUFFIX%%.so +%%PYTHON_SITELIBDIR%%/klayout/QtUiTools%%PYTHON_EXT_SUFFIX%%.so %%PYTHON_SITELIBDIR%%/klayout/QtWidgets%%PYTHON_EXT_SUFFIX%%.so %%PYTHON_SITELIBDIR%%/klayout/QtXml%%PYTHON_EXT_SUFFIX%%.so %%PYTHON_SITELIBDIR%%/klayout/QtXmlPatterns%%PYTHON_EXT_SUFFIX%%.so +%%PYTHON_SITELIBDIR%%/klayout/__init__.py +%%PYTHON_SITELIBDIR%%/klayout/db/__init__.py +%%PYTHON_SITELIBDIR%%/klayout/db/pcell_declaration_helper.py +%%PYTHON_SITELIBDIR%%/klayout/dbcore%%PYTHON_EXT_SUFFIX%%.so +%%PYTHON_SITELIBDIR%%/klayout/lay%%PYTHON_EXT_SUFFIX%%.so +%%PYTHON_SITELIBDIR%%/klayout/lib/__init__.py +%%PYTHON_SITELIBDIR%%/klayout/libcore%%PYTHON_EXT_SUFFIX%%.so +%%PYTHON_SITELIBDIR%%/klayout/pya/__init__.py %%PYTHON_SITELIBDIR%%/klayout/rdb/__init__.py %%PYTHON_SITELIBDIR%%/klayout/rdbcore%%PYTHON_EXT_SUFFIX%%.so %%PYTHON_SITELIBDIR%%/klayout/tl/__init__.py