git: f81528f28eaf - main - cad/klayout: update to 0.27.3

Hiroki Sato hrs at FreeBSD.org
Sat Aug 28 21:23:47 UTC 2021 

The branch main has been updated by hrs:

URL: https://cgit.FreeBSD.org/ports/commit/?id=f81528f28eaf3f85e88b768ab408ec31dd621b25

commit f81528f28eaf3f85e88b768ab408ec31dd621b25
Author:     Hiroki Sato <hrs at FreeBSD.org>
AuthorDate: 2021-08-28 21:20:03 +0000
Commit:     Hiroki Sato <hrs at FreeBSD.org>
CommitDate: 2021-08-28 21:23:10 +0000

    cad/klayout: update to 0.27.3
---
 cad/klayout/Makefile                               |  59 +++-
 cad/klayout/distinfo                               |   6 +-
 cad/klayout/files/patch-build.sh                   |  71 +++-
 cad/klayout/files/patch-src-ant-ant-ant.pro        |   9 +
 .../files/patch-src-ant-unit_tests-unit_tests.pro  |   9 +
 cad/klayout/files/patch-src-app.pri                |   9 +
 cad/klayout/files/patch-src-buddies-src-bd-bd.pro  |  32 ++
 .../files/patch-src-buddies-src-buddy_app.pri      |  40 +++
 .../patch-src-buddies-unit_tests-unit_tests.pro    |  12 +
 cad/klayout/files/patch-src-db-db-db.pro           |   9 +
 .../files/patch-src-db-unit_tests-unit_tests.pro   |   9 +
 cad/klayout/files/patch-src-drc-drc-drc.pro        |   9 +
 .../files/patch-src-drc-unit_tests-unit_tests.pro  |   8 +
 cad/klayout/files/patch-src-edt-edt-edt.pro        |   9 +
 .../files/patch-src-edt-unit_tests-unit_tests.pro  |   9 +
 cad/klayout/files/patch-src-gsi-gsi-gsi.pro        |   9 +
 .../files/patch-src-gsi-gsi_test-gsi_test.pro      |   8 +
 .../files/patch-src-gsi-unit_tests-unit_tests.pro  |   9 +
 .../files/patch-src-gsiqt-qt4-QtCore-QtCore.pro    |  11 +
 .../patch-src-gsiqt-qt4-QtDesigner-QtDesigner.pro  |  11 +
 .../files/patch-src-gsiqt-qt4-QtGui-QtGui.pro      |  17 +
 .../patch-src-gsiqt-qt4-QtNetwork-QtNetwork.pro    |  15 +
 .../files/patch-src-gsiqt-qt4-QtSql-QtSql.pro      |  15 +
 .../patch-src-gsiqt-qt4-QtUiTools-QtUiTools.pro    |  11 +
 .../files/patch-src-gsiqt-qt4-QtXml-QtXml.pro      |  11 +
 .../files/patch-src-gsiqt-qt5-QtCore-QtCore.pro    |  11 +
 .../patch-src-gsiqt-qt5-QtDesigner-QtDesigner.pro  |  11 +
 .../files/patch-src-gsiqt-qt5-QtGui-QtGui.pro      |  21 ++
 ...tch-src-gsiqt-qt5-QtMultimedia-QtMultimedia.pro |  19 ++
 .../patch-src-gsiqt-qt5-QtNetwork-QtNetwork.pro    |  15 +
 ...src-gsiqt-qt5-QtPrintSupport-QtPrintSupport.pro |  23 ++
 .../files/patch-src-gsiqt-qt5-QtSql-QtSql.pro      |  15 +
 .../files/patch-src-gsiqt-qt5-QtSvg-QtSvg.pro      |  23 ++
 .../patch-src-gsiqt-qt5-QtUiTools-QtUiTools.pro    |  11 +
 .../patch-src-gsiqt-qt5-QtWidgets-QtWidgets.pro    |  19 ++
 .../files/patch-src-gsiqt-qt5-QtXml-QtXml.pro      |  11 +
 ...h-src-gsiqt-qt5-QtXmlPatterns-QtXmlPatterns.pro |  15 +
 .../files/patch-src-gsiqt-qtbasic-qtbasic.pro      |  11 +
 cad/klayout/files/patch-src-img-img-img.pro        |   9 +
 .../files/patch-src-img-unit_tests-unit_tests.pro  |   9 +
 cad/klayout/files/patch-src-klayout.pri            |  25 +-
 ...-src-klayout_main-klayout_main-klayout_main.pro |  53 +++
 .../files/patch-src-klayout_main-tests-tests.pro   |   9 +
 cad/klayout/files/patch-src-lay-lay-lay.pro        |  55 ++++
 .../files/patch-src-lay-lay-laySignalHandler.cc    |  11 -
 .../files/patch-src-lay-lay-laySystemPaths.cc      |  19 ++
 .../files/patch-src-lay-unit_tests-unit_tests.pro  |   9 +
 .../patch-src-laybasic-laybasic-layBrowserDialog.h |  10 -
 .../files/patch-src-laybasic-laybasic-laybasic.pro |  31 +-
 .../patch-src-laybasic-unit_tests-unit_tests.pro   |   9 +
 cad/klayout/files/patch-src-lib-lib-lib.pro        |   9 +
 .../files/patch-src-lib-unit_tests-unit_tests.pro  |   9 +
 cad/klayout/files/patch-src-lib.pri                |  11 +
 cad/klayout/files/patch-src-lvs-lvs-lvs.pro        |   9 +
 .../files/patch-src-lvs-unit_tests-unit_tests.pro  |   9 +
 cad/klayout/files/patch-src-lym-lym-lym.pro        |  30 ++
 .../files/patch-src-lym-unit_tests-unit_tests.pro  |  25 ++
 cad/klayout/files/patch-src-plugins-db_plugin.pri  |  27 ++
 cad/klayout/files/patch-src-plugins-lay_plugin.pri |  27 ++
 cad/klayout/files/patch-src-plugins-plugins.pro    |  10 +
 ...plugins-streamers-cif-lay_plugin-lay_plugin.pro |  11 +
 ...plugins-streamers-cif-unit_tests-unit_tests.pro |  14 +
 ...plugins-streamers-dxf-lay_plugin-lay_plugin.pro |  11 +
 ...plugins-streamers-dxf-unit_tests-unit_tests.pro |  14 +
 ...lugins-streamers-gds2-lay_plugin-lay_plugin.pro |  11 +
 ...lugins-streamers-gds2-unit_tests-unit_tests.pro |  14 +
 ...gins-streamers-lefdef-lay_plugin-lay_plugin.pro |  11 +
 ...gins-streamers-lefdef-unit_tests-unit_tests.pro |  14 +
 ...ugins-streamers-magic-lay_plugin-lay_plugin.pro |  11 +
 ...ugins-streamers-magic-unit_tests-unit_tests.pro |  14 +
 ...ugins-streamers-oasis-lay_plugin-lay_plugin.pro |  11 +
 ...ugins-streamers-oasis-unit_tests-unit_tests.pro |  14 +
 ...plugins-streamers-pcb-lay_plugin-lay_plugin.pro |  11 +
 ...plugins-streamers-pcb-unit_tests-unit_tests.pro |  14 +
 ...rc-plugins-tools-diff-lay_plugin-lay_plugin.pro |  11 +
 ...gins-tools-net_tracer-lay_plugin-lay_plugin.pro |  11 +
 ...gins-tools-net_tracer-unit_tests-unit_tests.pro |  15 +
 ...lugins-tools-view_25d-lay_plugin-lay_plugin.pro |  11 +
 ...lugins-tools-view_25d-unit_tests-unit_tests.pro |  14 +
 ...src-plugins-tools-xor-lay_plugin-lay_plugin.pro |  11 +
 cad/klayout/files/patch-src-pya-pya-pya.pro        |  11 +
 .../files/patch-src-pya-unit_tests-unit_tests.pro  |   9 +
 cad/klayout/files/patch-src-pyastub-pyastub.pro    |  11 +
 .../files/patch-src-pymod-QtCore-QtCore.pro        |  13 +
 .../patch-src-pymod-QtDesigner-QtDesigner.pro      |   8 +
 cad/klayout/files/patch-src-pymod-QtGui-QtGui.pro  |  14 +
 .../patch-src-pymod-QtMultimedia-QtMultimedia.pro  |   8 +
 .../files/patch-src-pymod-QtNetwork-QtNetwork.pro  |   8 +
 ...tch-src-pymod-QtPrintSupport-QtPrintSupport.pro |   8 +
 cad/klayout/files/patch-src-pymod-QtSql-QtSql.pro  |   8 +
 cad/klayout/files/patch-src-pymod-QtSvg-QtSvg.pro  |   8 +
 .../files/patch-src-pymod-QtUiTools-QtUiTools.pro  |  11 +
 .../files/patch-src-pymod-QtWidgets-QtWidgets.pro  |   8 +
 cad/klayout/files/patch-src-pymod-QtXml-QtXml.pro  |  17 +
 ...patch-src-pymod-QtXmlPatterns-QtXmlPatterns.pro |   8 +
 ...patch-src-pymod-bridge_sample-bridge_sample.pro |  17 +
 cad/klayout/files/patch-src-pymod-db-db.pro        |   9 +
 cad/klayout/files/patch-src-pymod-lay-lay.pro      |   9 +
 cad/klayout/files/patch-src-pymod-pymod.pri        |  45 +++
 cad/klayout/files/patch-src-pymod-rdb-rdb.pro      |   8 +
 cad/klayout/files/patch-src-pymod-tl-tl.pro        |  35 ++
 .../patch-src-pymod-unit_tests-unit_tests.pro      |   8 +
 cad/klayout/files/patch-src-rba-rba-rba.pro        |   9 +
 .../files/patch-src-rba-unit_tests-unit_tests.pro  |  11 +
 cad/klayout/files/patch-src-rbastub-rbastub.pro    |   9 +
 cad/klayout/files/patch-src-rdb-rdb-rdb.pro        |   9 +
 .../files/patch-src-rdb-unit_tests-unit_tests.pro  |   9 +
 cad/klayout/files/patch-src-tl-tl-tlStream.cc      |  20 --
 .../files/patch-src-tl-unit_tests-unit_tests.pro   |   9 +
 .../files/patch-src-unit_tests-unit_tests.pro      |  28 ++
 cad/klayout/files/patch-src-with_all_libs.pri      |  55 ++++
 cad/klayout/pkg-plist                              | 365 +++++++++++++++++----
 112 files changed, 1918 insertions(+), 172 deletions(-)

diff --git a/cad/klayout/Makefile b/cad/klayout/Makefile
index 41de80bbe590..e513a94a6c1d 100644
--- a/cad/klayout/Makefile
+++ b/cad/klayout/Makefile
@@ -1,11 +1,10 @@
 PORTNAME=	klayout
-PORTVERSION=	0.25.8
-PORTREVISION=	2
+PORTVERSION=	0.27.3
 DISTVERSIONPREFIX=	v
 CATEGORIES=	cad
 
 MAINTAINER=	hrs at FreeBSD.org
-COMMENT=	Qt-based GDS2 Viewer
+COMMENT=	Qt-based chip mask layout viewing and editing tool
 
 LICENSE=	GPLv2
 
@@ -22,32 +21,62 @@ USE_QT=		core buildtools designer gui multimedia network printsupport \
 		qmake sql svg testlib widgets xml xmlpatterns
 USE_LDCONFIG=	yes
 
-CXXFLAGS+=	-fPIC -I${LOCALBASE}/include/qt5
-LDFLAGS+=	${LIBS} -L${LOCALBASE}/lib/qt5 -lpthread
+CXXFLAGS+=	-fPIC -I${LOCALBASE}/include/qt5 \
+		${QT5MODULES:S,^,-I${LOCALBASE}/include/qt5/Qt,}
+LDFLAGS+=	${LIBS} ${QT5MODULES:S,^,-lQt5,} \
+		-L${LOCALBASE}/lib/qt5 -lpthread
 QT5MODULES=	Core Designer Gui Multimedia MultimediaWidgets \
 		Network PrintSupport Sql Svg Test Widgets Xml XmlPatterns
-.for M in ${QT5MODULES}
-CXXFLAGS+=	-I${LOCALBASE}/include/qt5/Qt${M}
-LIBS+=		-lQt5${M}
-.endfor
-MAKE_ENV=	INSTALL_ROOT=${STAGEDIR}
+MAKE_ENV=	INSTALLROOT=${STAGEDIR} \
+		PYTHON_SITELIBDIR=${PYTHON_SITELIBDIR}
 BUILD_WRKSRC=	${WRKSRC}/build-release
 INSTALL_WRKSRC=	${WRKSRC}/build-release
+TEST_WRKSRC=	${WRKSRC}/build-release
 
 do-configure:
 	cd ${WRKSRC} && \
 	    ${SETENV} ${MAKE_ENV} ${SH} build.sh \
 		-with-qtbinding \
 		-qt5 \
-		-rpath ${LOCALBASE}/lib \
-		-prefix ${PREFIX} \
+		-rpath "${PREFIX}/lib/klayout" \
+		-prefix "${PREFIX}" \
 		-python ${PYTHON_CMD} \
 		-ruby ${RUBY} \
 		-dry-run
 
+post-configure:
+	${ECHO_CMD} "#define PLUGINS_BASEDIR \"${PREFIX}/lib/klayout\"" \
+	    > ${WRKSRC}/src/lay/lay/laySystemPathsDefaults.h
+
+pre-install:
+	for D in lib db tl rdb pya; do \
+	    ${MKDIR} ${STAGEDIR}${PYTHON_SITELIBDIR}/klayout/$${D}; \
+	done
+	for D in db_plugins lay_plugins; do \
+	    ${MKDIR} ${STAGEDIR}${PREFIX}/lib/klayout/$${D}; \
+	done
+
 post-install:
-	cd ${STAGEDIR}${PREFIX} && \
-	    ${MV} libklayout* ${STAGEDIR}${PREFIX}/lib && \
-	    ${MV} klayout strm* ${STAGEDIR}${PREFIX}/bin
+	cd ${INSTALL_WRKSRC} && \
+	    ${STRIP_CMD} `${FIND} libklayout*so* -type f` && \
+	    ${MV} libklayout*so* ${STAGEDIR}${PREFIX}/lib/klayout
+.for D in db_plugins lay_plugins
+	cd ${INSTALL_WRKSRC}/$D && \
+	    ${STRIP_CMD} `${FIND} *so* -type f` && \
+	    ${MV} *so* ${STAGEDIR}${PREFIX}/lib/klayout/$D
+.endfor
+	cd ${INSTALL_WRKSRC}/pymod && \
+	    ${STRIP_CMD} `${FIND} lib*so* -type f` && \
+	    ${MV} lib*so* ${STAGEDIR}${PREFIX}/lib/klayout
+	cd ${STAGEDIR}${PYTHON_SITELIBDIR}/klayout && \
+	    ${STRIP_CMD} `${FIND} *.so -type f`
+	cd ${INSTALL_WRKSRC} && \
+	    ${INSTALL_PROGRAM} klayout strm* ${STAGEDIR}${PREFIX}/bin
+
+do-test:
+	cd ${TEST_WRKSRC} && \
+	    ${SETENV} QT_QPA_PLATFORM=offscreen TESTTMP=testtmp TESTSRC=.. \
+	    LD_LIBRARY_PATH=${STAGEDIR}${PREFIX}/lib/klayout/db_plugins:${STAGEDIR}${PREFIX}/lib/klayout/lay_plugins \
+	    ./ut_runner
 
 .include <bsd.port.mk>
diff --git a/cad/klayout/distinfo b/cad/klayout/distinfo
index 3acbfd113ca4..3e03d3a59f2c 100644
--- a/cad/klayout/distinfo
+++ b/cad/klayout/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1552658839
-SHA256 (KLayout-klayout-v0.25.8_GH0.tar.gz) = 63372bda3ed825552e01f505a3c979431f0485300183c38ebceb864451c24cbe
-SIZE (KLayout-klayout-v0.25.8_GH0.tar.gz) = 21009736
+TIMESTAMP = 1629922499
+SHA256 (KLayout-klayout-v0.27.3_GH0.tar.gz) = 8c21e6898db5285bf75e65f9a74724564e3419cd76a35bfc53dde3944827017a
+SIZE (KLayout-klayout-v0.27.3_GH0.tar.gz) = 57274694
diff --git a/cad/klayout/files/patch-build.sh b/cad/klayout/files/patch-build.sh
index 8979b3f04bfc..d899e68e1a71 100644
--- a/cad/klayout/files/patch-build.sh
+++ b/cad/klayout/files/patch-build.sh
@@ -1,6 +1,6 @@
---- build.sh.orig	2019-02-23 17:34:47 UTC
+--- build.sh.orig	2021-07-23 08:00:26 UTC
 +++ build.sh
-@@ -482,7 +482,7 @@ echo "    Build directory: $BUILD"
+@@ -576,7 +576,7 @@ echo "    Build directory: $BUILD"
  mkdir -p $BUILD
  
  # source the version script
@@ -9,7 +9,7 @@
  
  # qmake needs absolute paths, so we get them now:
  #   OSX does not have `readlink -f` command. Use equivalent Perl script.
-@@ -495,11 +495,7 @@ else
+@@ -589,11 +589,7 @@ else
  fi
  
  if [ "$IS_MAC" = "no" ]; then
@@ -21,7 +21,7 @@
  else
    MAKE_PRG=make
  fi
-@@ -521,9 +517,9 @@ cd $BUILD
+@@ -615,9 +611,9 @@ cd $BUILD
  
  # chose the right qmake
  if [ $HAVE_QT5 = 0 ]; then
@@ -33,28 +33,38 @@
  fi
  
  $QMAKE -v
-@@ -531,54 +527,55 @@ $QMAKE -v
+@@ -625,82 +621,85 @@ $QMAKE -v
  # Force a minimum rebuild because of version info
  touch $CURR_DIR/src/version/version.h
  
 -qmake_options=(
-+## XXX
-+##  CONFIG=\"$CONFIG\"
++# XXX
++#  CONFIG=\"$CONFIG\"
 +qmake_options="
    -recursive
 -  CONFIG+="$CONFIG"
 -  RUBYLIBFILE="$RUBYLIBFILE"
--  RUBYINCLUDE="$RUBYINCLUDE"
--  RUBYINCLUDE2="$RUBYINCLUDE2"
 -  RUBYVERSIONCODE="$RUBYVERSIONCODE"
 -  HAVE_RUBY="$HAVE_RUBY"
+-  PYTHON="$PYTHON"
 -  PYTHONLIBFILE="$PYTHONLIBFILE"
 -  PYTHONINCLUDE="$PYTHONINCLUDE"
+-  PYTHONEXTSUFFIX="$PYTHONEXTSUFFIX"
 -  HAVE_PYTHON="$HAVE_PYTHON"
 -  HAVE_QTBINDINGS="$HAVE_QTBINDINGS"
+-  HAVE_QT_UITOOLS="$HAVE_QT_UITOOLS"
+-  HAVE_QT_NETWORK="$HAVE_QT_NETWORK"
+-  HAVE_QT_SQL="$HAVE_QT_SQL"
+-  HAVE_QT_SVG="$HAVE_QT_SVG"
+-  HAVE_QT_PRINTSUPPORT="$HAVE_QT_PRINTSUPPORT"
+-  HAVE_QT_MULTIMEDIA="$HAVE_QT_MULTIMEDIA"
+-  HAVE_QT_DESIGNER="$HAVE_QT_DESIGNER"
+-  HAVE_QT_XML="$HAVE_QT_XML"
 -  HAVE_64BIT_COORD="$HAVE_64BIT_COORD"
+-  HAVE_QT="$HAVE_QT"
 -  HAVE_QT5="$HAVE_QT5"
 -  HAVE_CURL="$HAVE_CURL"
+-  HAVE_EXPAT="$HAVE_EXPAT"
 -  PREFIX="$BIN"
 -  RPATH="$RPATH"
 -  KLAYOUT_VERSION="$KLAYOUT_VERSION"
@@ -62,17 +72,27 @@
 -  KLAYOUT_VERSION_REV="$KLAYOUT_VERSION_REV"
 -)
 +  RUBYLIBFILE=\"$RUBYLIBFILE\"
-+  RUBYINCLUDE=\"$RUBYINCLUDE\"
-+  RUBYINCLUDE2=\"$RUBYINCLUDE2\"
 +  RUBYVERSIONCODE=\"$RUBYVERSIONCODE\"
 +  HAVE_RUBY=\"$HAVE_RUBY\"
++  PYTHON=\"$PYTHON\"
 +  PYTHONLIBFILE=\"$PYTHONLIBFILE\"
 +  PYTHONINCLUDE=\"$PYTHONINCLUDE\"
++  PYTHONEXTSUFFIX=\"$PYTHONEXTSUFFIX\"
 +  HAVE_PYTHON=\"$HAVE_PYTHON\"
 +  HAVE_QTBINDINGS=\"$HAVE_QTBINDINGS\"
++  HAVE_QT_UITOOLS=\"$HAVE_QT_UITOOLS\"
++  HAVE_QT_NETWORK=\"$HAVE_QT_NETWORK\"
++  HAVE_QT_SQL=\"$HAVE_QT_SQL\"
++  HAVE_QT_SVG=\"$HAVE_QT_SVG\"
++  HAVE_QT_PRINTSUPPORT=\"$HAVE_QT_PRINTSUPPORT\"
++  HAVE_QT_MULTIMEDIA=\"$HAVE_QT_MULTIMEDIA\"
++  HAVE_QT_DESIGNER=\"$HAVE_QT_DESIGNER\"
++  HAVE_QT_XML=\"$HAVE_QT_XML\"
 +  HAVE_64BIT_COORD=\"$HAVE_64BIT_COORD\"
++  HAVE_QT=\"$HAVE_QT\"
 +  HAVE_QT5=\"$HAVE_QT5\"
 +  HAVE_CURL=\"$HAVE_CURL\"
++  HAVE_EXPAT=\"$HAVE_EXPAT\"
 +  PREFIX=\"$BIN\"
 +  RPATH=\"$RPATH\"
 +  KLAYOUT_VERSION=\"$KLAYOUT_VERSION\"
@@ -80,6 +100,29 @@
 +  KLAYOUT_VERSION_REV=\"$KLAYOUT_VERSION_REV\"
 +"
  
+ # NOTE: qmake does not like include paths which clash with paths built into the compiler
+ # hence we don't add RUBYINCLUDE or RUBYINCLUDE2 in this case (found on CentOS 8 where Ruby
+ # headers are installed in /usr/include)
+ if [ "$RUBYINCLUDE" != "/usr/include" ] && [  "$RUBYINCLUDE" != "/usr/local/include" ]; then
+-  qmake_options+=( RUBYINCLUDE="$RUBYINCLUDE" )
++  qmake_options="$qmake_options RUBYINCLUDE=\"$RUBYINCLUDE\""
+ fi
+ if [ "$RUBYINCLUDE2" != "/usr/include" ] && [  "$RUBYINCLUDE2" != "/usr/local/include" ]; then
+-  qmake_options+=( RUBYINCLUDE2="$RUBYINCLUDE2" )
++  qmake_options="$qmake_options RUBYINCLUDE2=\"$RUBYINCLUDE2\""
+ fi
+ 
+ # This should speed up build time considerably
+ # https://ortogonal.github.io/ccache-and-qmake-qtcreator/
+ if [ "$QMAKE_CCACHE" = 1 ]; then
+-  qmake_options+=(
+-    CONFIG+="ccache"
+-  )
++  qmake_options="$qmake_options
++    CONFIG+=\"ccache\"
++  "
+ fi
+ 
  if [ $BUILD_EXPERT = 1 ]; then
 -  qmake_options+=(
 -    QMAKE_AR="$AR cqs"
@@ -119,8 +162,10 @@
  
 -echo $QMAKE "$CURR_DIR/src/klayout.pro" "${qmake_options[@]}"
 -$QMAKE "$CURR_DIR/src/klayout.pro" "${qmake_options[@]}"
-+echo $QMAKE "$CURR_DIR/src/klayout.pro" ${qmake_options} QMAKE_CFLAGS="$CFLAGS"
-+$QMAKE "$CURR_DIR/src/klayout.pro" ${qmake_options} QMAKE_CXXFLAGS="$CXXFLAGS" QMAKE_CFLAGS="$CFLAGS" QMAKE_LFLAGS="$LDFLAGS"
++echo $QMAKE "$CURR_DIR/src/klayout.pro" ${qmake_options} \
++  QMAKE_CXXFLAGS="$CXXFLAGS" QMAKE_CFLAGS="$CFLAGS" QMAKE_LFLAGS="$LDFLAGS"
++$QMAKE "$CURR_DIR/src/klayout.pro" ${qmake_options} \
++  QMAKE_CXXFLAGS="$CXXFLAGS" QMAKE_CFLAGS="$CFLAGS" QMAKE_LFLAGS="$LDFLAGS"
  
  cd $CURR_DIR
  echo ""
diff --git a/cad/klayout/files/patch-src-ant-ant-ant.pro b/cad/klayout/files/patch-src-ant-ant-ant.pro
new file mode 100644
index 000000000000..5b49f9566830
--- /dev/null
+++ b/cad/klayout/files/patch-src-ant-ant-ant.pro
@@ -0,0 +1,9 @@
+--- src/ant/ant/ant.pro.orig	2021-08-28 17:19:48 UTC
++++ src/ant/ant/ant.pro
+@@ -37,5 +37,5 @@ SOURCES = \
+ 
+ INCLUDEPATH += $$TL_INC $$GSI_INC $$LAYBASIC_INC $$DB_INC
+ DEPENDPATH += $$TL_INC $$GSI_INC $$LAYBASIC_INC $$DB_INC
+-LIBS += -L$$DESTDIR -lklayout_tl -lklayout_gsi -lklayout_laybasic -lklayout_db
++LIBS += $$DESTDIR/libklayout_tl.so $$DESTDIR/libklayout_gsi.so $$DESTDIR/libklayout_laybasic.so $$DESTDIR/libklayout_db.so
+ 
diff --git a/cad/klayout/files/patch-src-ant-unit_tests-unit_tests.pro b/cad/klayout/files/patch-src-ant-unit_tests-unit_tests.pro
new file mode 100644
index 000000000000..dc522ea67561
--- /dev/null
+++ b/cad/klayout/files/patch-src-ant-unit_tests-unit_tests.pro
@@ -0,0 +1,9 @@
+--- src/ant/unit_tests/unit_tests.pro.orig	2021-08-28 17:19:11 UTC
++++ src/ant/unit_tests/unit_tests.pro
+@@ -12,5 +12,5 @@ SOURCES = \
+ INCLUDEPATH += $$ANT_INC $$TL_INC $$LAYBASIC_INC $$DB_INC $$GSI_INC
+ DEPENDPATH += $$ANT_INC $$TL_INC $$LAYBASIC_INC $$DB_INC $$GSI_INC
+ 
+-LIBS += -L$$DESTDIR_UT -lklayout_ant -lklayout_laybasic -lklayout_db -lklayout_tl -lklayout_gsi
++LIBS += $$DESTDIR_UT/libklayout_ant.so $$DESTDIR_UT/libklayout_laybasic.so $$DESTDIR_UT/libklayout_db.so $$DESTDIR_UT/libklayout_tl.so $$DESTDIR_UT/libklayout_gsi.so
+ 
diff --git a/cad/klayout/files/patch-src-app.pri b/cad/klayout/files/patch-src-app.pri
new file mode 100644
index 000000000000..47203de7360c
--- /dev/null
+++ b/cad/klayout/files/patch-src-app.pri
@@ -0,0 +1,9 @@
+--- src/app.pri.orig	2021-08-27 07:30:18 UTC
++++ src/app.pri
+@@ -1,5 +1,5 @@
+ 
+ TEMPLATE = app
+ 
+-target.path = $$PREFIX
++target.path = $$shell_path($(INSTALLROOT)$$PREFIX/bin)
+ INSTALLS += target
diff --git a/cad/klayout/files/patch-src-buddies-src-bd-bd.pro b/cad/klayout/files/patch-src-buddies-src-bd-bd.pro
new file mode 100644
index 000000000000..26d2620e8a3a
--- /dev/null
+++ b/cad/klayout/files/patch-src-buddies-src-bd-bd.pro
@@ -0,0 +1,32 @@
+--- src/buddies/src/bd/bd.pro.orig	2021-08-28 16:26:18 UTC
++++ src/buddies/src/bd/bd.pro
+@@ -34,24 +34,24 @@ RESOURCES = \
+ 
+ INCLUDEPATH += $$TL_INC $$GSI_INC $$VERSION_INC $$DB_INC $$LIB_INC $$RDB_INC $$LYM_INC
+ DEPENDPATH += $$TL_INC $$GSI_INC $$VERSION_INC $$DB_INC $$LIB_INC $$RDB_INC $$LYM_INC
+-LIBS += -L$$DESTDIR -lklayout_tl -lklayout_db -lklayout_gsi -lklayout_lib -lklayout_rdb -lklayout_lym
++LIBS += $$DESTDIR/libklayout_tl.so $$DESTDIR/libklayout_db.so $$DESTDIR/libklayout_gsi.so $$DESTDIR/libklayout_lib.so $$DESTDIR/libklayout_rdb.so $$DESTDIR/libklayout_lym.so
+ 
+ INCLUDEPATH += $$RBA_INC
+ DEPENDPATH += $$RBA_INC
+ 
+ equals(HAVE_RUBY, "1") {
+-  LIBS += -lklayout_rba
++  LIBS += $$DESTDIR/libklayout_rba.so
+ } else {
+-  LIBS += -lklayout_rbastub
++  LIBS += $$DESTDIR/libklayout_rbastub.so
+ }
+ 
+ INCLUDEPATH += $$PYA_INC
+ DEPENDPATH += $$PYA_INC
+ 
+ equals(HAVE_PYTHON, "1") {
+-  LIBS += -lklayout_pya
++  LIBS += $$DESTDIR/libklayout_pya.so
+ } else {
+-  LIBS += -lklayout_pyastub
++  LIBS += $$DESTDIR/libklayout_pyastub.so
+ }
+ 
+ 
diff --git a/cad/klayout/files/patch-src-buddies-src-buddy_app.pri b/cad/klayout/files/patch-src-buddies-src-buddy_app.pri
new file mode 100644
index 000000000000..c307d494d17d
--- /dev/null
+++ b/cad/klayout/files/patch-src-buddies-src-buddy_app.pri
@@ -0,0 +1,40 @@
+--- src/buddies/src/buddy_app.pri.orig	2021-07-23 08:00:26 UTC
++++ src/buddies/src/buddy_app.pri
+@@ -19,31 +19,31 @@ SOURCES = $$PWD/bd/main.cc
+ 
+ INCLUDEPATH += $$BD_INC $$TL_INC $$GSI_INC
+ DEPENDPATH += $$BD_INC $$TL_INC $$GSI_INC
+-LIBS += -L$$DESTDIR -lklayout_bd -lklayout_db -lklayout_tl -lklayout_gsi -lklayout_lib -lklayout_rdb -lklayout_lym
++LIBS += $$DESTDIR/libklayout_bd.so $$DESTDIR/libklayout_db.so $$DESTDIR/libklayout_tl.so $$DESTDIR/libklayout_gsi.so $$DESTDIR/libklayout_lib.so $$DESTDIR/libklayout_rdb.so $$DESTDIR/libklayout_lym.so
+ 
+ INCLUDEPATH += $$RBA_INC
+ DEPENDPATH += $$RBA_INC
+ 
+ equals(HAVE_RUBY, "1") {
+-  LIBS += -lklayout_rba
++  LIBS += $$DESTDIR/libklayout_rba.so
+ } else {
+-  LIBS += -lklayout_rbastub
++  LIBS += $$DESTDIR/libklayout_rbastub.so
+ }
+ 
+ INCLUDEPATH += $$PYA_INC
+ DEPENDPATH += $$PYA_INC
+ 
+ equals(HAVE_PYTHON, "1") {
+-  LIBS += -lklayout_pya
++  LIBS += $$DESTDIR/libklayout_pya.so
+ } else {
+-  LIBS += -lklayout_pyastub
++  LIBS += $$DESTDIR/libklayout_pyastub.so
+ }
+ 
+ DEFINES += BD_TARGET=$$TARGET
+ 
+ LIBS += $$RUBYLIBFILE
+ 
+-if(mac|linux*) {
++if(mac|linux*|*bsd*) {
+   LIBS += -ldl
+ }
+ 
diff --git a/cad/klayout/files/patch-src-buddies-unit_tests-unit_tests.pro b/cad/klayout/files/patch-src-buddies-unit_tests-unit_tests.pro
new file mode 100644
index 000000000000..570721cd013f
--- /dev/null
+++ b/cad/klayout/files/patch-src-buddies-unit_tests-unit_tests.pro
@@ -0,0 +1,12 @@
+--- src/buddies/unit_tests/unit_tests.pro.orig	2021-07-23 08:00:26 UTC
++++ src/buddies/unit_tests/unit_tests.pro
+@@ -27,4 +27,8 @@ SOURCES += \
+ INCLUDEPATH += $$BD_INC $$DB_INC $$TL_INC $$GSI_INC $$RBA_INC
+ DEPENDPATH += $$BD_INC $$DB_INC $$TL_INC $$GSI_INC $$RBA_INC
+ 
+-LIBS += -L$$DESTDIR_UT -lklayout_bd -lklayout_db -lklayout_tl -lklayout_gsi -l$$RBA_LIB
++LIBS += $$DESTDIR_UT/libklayout_bd.so $$DESTDIR_UT/libklayout_db.so $$DESTDIR_UT/libklayout_tl.so $$DESTDIR_UT/libklayout_gsi.so
++
++!isEmpty(RBA_LIB) {
++  LIBS += $$DESTDIR_UT/lib$${RBA_LIB}.so
++}
diff --git a/cad/klayout/files/patch-src-db-db-db.pro b/cad/klayout/files/patch-src-db-db-db.pro
new file mode 100644
index 000000000000..c1a123f34822
--- /dev/null
+++ b/cad/klayout/files/patch-src-db-db-db.pro
@@ -0,0 +1,9 @@
+--- src/db/db/db.pro.orig	2021-08-28 16:45:43 UTC
++++ src/db/db/db.pro
+@@ -395,5 +395,5 @@ HEADERS = \
+ 
+ INCLUDEPATH += $$TL_INC $$GSI_INC
+ DEPENDPATH += $$TL_INC $$GSI_INC
+-LIBS += -L$$DESTDIR -lklayout_tl -lklayout_gsi
++LIBS += $$DESTDIR/libklayout_tl.so $$DESTDIR/libklayout_gsi.so
+ 
diff --git a/cad/klayout/files/patch-src-db-unit_tests-unit_tests.pro b/cad/klayout/files/patch-src-db-unit_tests-unit_tests.pro
new file mode 100644
index 000000000000..4179a0463d6e
--- /dev/null
+++ b/cad/klayout/files/patch-src-db-unit_tests-unit_tests.pro
@@ -0,0 +1,9 @@
+--- src/db/unit_tests/unit_tests.pro.orig	2021-08-28 17:26:04 UTC
++++ src/db/unit_tests/unit_tests.pro
+@@ -87,5 +87,5 @@ SOURCES = \
+ INCLUDEPATH += $$TL_INC $$DB_INC $$GSI_INC
+ DEPENDPATH += $$TL_INC $$DB_INC $$GSI_INC
+ 
+-LIBS += -L$$DESTDIR_UT -lklayout_db -lklayout_tl -lklayout_gsi
++LIBS += $$DESTDIR_UT/libklayout_db.so $$DESTDIR_UT/libklayout_tl.so $$DESTDIR_UT/libklayout_gsi.so
+ 
diff --git a/cad/klayout/files/patch-src-drc-drc-drc.pro b/cad/klayout/files/patch-src-drc-drc-drc.pro
new file mode 100644
index 000000000000..da35391f9019
--- /dev/null
+++ b/cad/klayout/files/patch-src-drc-drc-drc.pro
@@ -0,0 +1,9 @@
+--- src/drc/drc/drc.pro.orig	2021-08-28 17:01:48 UTC
++++ src/drc/drc/drc.pro
+@@ -18,5 +18,5 @@ RESOURCES = \
+ 
+ INCLUDEPATH += $$TL_INC $$DB_INC $$GSI_INC $$LYM_INC $$RDB_INC
+ DEPENDPATH += $$TL_INC $$DB_INC $$GSI_INC $$LYM_INC $$RDB_INC
+-LIBS += -L$$DESTDIR -lklayout_tl -lklayout_db -lklayout_gsi -lklayout_lym -lklayout_rdb
++LIBS += $$DESTDIR/libklayout_tl.so $$DESTDIR/libklayout_db.so $$DESTDIR/libklayout_gsi.so $$DESTDIR/libklayout_lym.so $$DESTDIR/libklayout_rdb.so
+ 
diff --git a/cad/klayout/files/patch-src-drc-unit_tests-unit_tests.pro b/cad/klayout/files/patch-src-drc-unit_tests-unit_tests.pro
new file mode 100644
index 000000000000..2b53df079016
--- /dev/null
+++ b/cad/klayout/files/patch-src-drc-unit_tests-unit_tests.pro
@@ -0,0 +1,8 @@
+--- src/drc/unit_tests/unit_tests.pro.orig	2021-08-28 17:02:21 UTC
++++ src/drc/unit_tests/unit_tests.pro
+@@ -15,4 +15,4 @@ SOURCES = \
+ INCLUDEPATH += $$DRC_INC $$TL_INC $$RDB_INC $$DB_INC $$GSI_INC $$LYM_INC
+ DEPENDPATH += $$DRC_INC $$TL_INC $$RDB_INC $$DB_INC $$GSI_INC $$LYM_INC
+ 
+-LIBS += -L$$DESTDIR_UT -lklayout_drc -lklayout_rdb -lklayout_db -lklayout_tl -lklayout_gsi -lklayout_lym
++LIBS += $$DESTDIR_UT/libklayout_drc.so $$DESTDIR_UT/libklayout_rdb.so $$DESTDIR_UT/libklayout_db.so $$DESTDIR_UT/libklayout_tl.so $$DESTDIR_UT/libklayout_gsi.so $$DESTDIR_UT/libklayout_lym.so
diff --git a/cad/klayout/files/patch-src-edt-edt-edt.pro b/cad/klayout/files/patch-src-edt-edt-edt.pro
new file mode 100644
index 000000000000..0060a03db527
--- /dev/null
+++ b/cad/klayout/files/patch-src-edt-edt-edt.pro
@@ -0,0 +1,9 @@
+--- src/edt/edt/edt.pro.orig	2021-08-28 16:59:48 UTC
++++ src/edt/edt/edt.pro
+@@ -71,5 +71,5 @@ DEPENDPATH += $$TL_INC $$GSI_INC $$LAYBASIC_INC $$DB_I
+ INCLUDEPATH += $$DESTDIR/laybasic/laybasic
+ DEPENDPATH += $$DESTDIR/laybasic/laybasic
+ 
+-LIBS += -L$$DESTDIR -lklayout_tl -lklayout_gsi -lklayout_laybasic -lklayout_db
++LIBS += $$DESTDIR/libklayout_tl.so $$DESTDIR/libklayout_gsi.so $$DESTDIR/libklayout_laybasic.so $$DESTDIR/libklayout_db.so
+ 
diff --git a/cad/klayout/files/patch-src-edt-unit_tests-unit_tests.pro b/cad/klayout/files/patch-src-edt-unit_tests-unit_tests.pro
new file mode 100644
index 000000000000..4118adc1ad39
--- /dev/null
+++ b/cad/klayout/files/patch-src-edt-unit_tests-unit_tests.pro
@@ -0,0 +1,9 @@
+--- src/edt/unit_tests/unit_tests.pro.orig	2021-08-28 16:59:05 UTC
++++ src/edt/unit_tests/unit_tests.pro
+@@ -13,5 +13,5 @@ SOURCES = \
+ INCLUDEPATH += $$EDT_INC $$TL_INC $$LAYBASIC_INC $$DB_INC $$GSI_INC
+ DEPENDPATH += $$EDT_INC $$TL_INC $$LAYBASIC_INC $$DB_INC $$GSI_INC
+ 
+-LIBS += -L$$DESTDIR_UT -lklayout_edt -lklayout_laybasic -lklayout_db -lklayout_tl -lklayout_gsi
++LIBS += $$DESTDIR_UT/libklayout_edt.so $$DESTDIR_UT/libklayout_laybasic.so $$DESTDIR_UT/libklayout_db.so $$DESTDIR_UT/libklayout_tl.so $$DESTDIR_UT/libklayout_gsi.so
+ 
diff --git a/cad/klayout/files/patch-src-gsi-gsi-gsi.pro b/cad/klayout/files/patch-src-gsi-gsi-gsi.pro
new file mode 100644
index 000000000000..d08d24f9a5ae
--- /dev/null
+++ b/cad/klayout/files/patch-src-gsi-gsi-gsi.pro
@@ -0,0 +1,9 @@
+--- src/gsi/gsi/gsi.pro.orig	2021-08-28 17:25:20 UTC
++++ src/gsi/gsi/gsi.pro
+@@ -51,5 +51,5 @@ SOURCES += gsiDeclTl.cc 
+ 
+ INCLUDEPATH += $$TL_INC
+ DEPENDPATH += $$TL_INC
+-LIBS += -L$$DESTDIR -lklayout_tl
++LIBS += $$DESTDIR/libklayout_tl.so
+ 
diff --git a/cad/klayout/files/patch-src-gsi-gsi_test-gsi_test.pro b/cad/klayout/files/patch-src-gsi-gsi_test-gsi_test.pro
new file mode 100644
index 000000000000..85e056ef931c
--- /dev/null
+++ b/cad/klayout/files/patch-src-gsi-gsi_test-gsi_test.pro
@@ -0,0 +1,8 @@
+--- src/gsi/gsi_test/gsi_test.pro.orig	2021-08-28 17:03:04 UTC
++++ src/gsi/gsi_test/gsi_test.pro
+@@ -18,4 +18,4 @@ HEADERS = \
+ 
+ INCLUDEPATH += $$TL_INC $$GSI_INC
+ DEPENDPATH += $$TL_INC $$GSI_INC
+-LIBS += -L$$DESTDIR -lklayout_tl -lklayout_gsi
++LIBS += $$DESTDIR/libklayout_tl.so $$DESTDIR/libklayout_gsi.so
diff --git a/cad/klayout/files/patch-src-gsi-unit_tests-unit_tests.pro b/cad/klayout/files/patch-src-gsi-unit_tests-unit_tests.pro
new file mode 100644
index 000000000000..cc11f32e7264
--- /dev/null
+++ b/cad/klayout/files/patch-src-gsi-unit_tests-unit_tests.pro
@@ -0,0 +1,9 @@
+--- src/gsi/unit_tests/unit_tests.pro.orig	2021-08-28 17:03:32 UTC
++++ src/gsi/unit_tests/unit_tests.pro
+@@ -14,5 +14,5 @@ HEADERS += \
+ INCLUDEPATH += $$TL_INC $$GSI_INC
+ DEPENDPATH += $$TL_INC $$GSI_INC
+ 
+-LIBS += -L$$DESTDIR_UT -lklayout_tl -lklayout_gsi
++LIBS += $$DESTDIR_UT/libklayout_tl.so $$DESTDIR_UT/libklayout_gsi.so
+ 
diff --git a/cad/klayout/files/patch-src-gsiqt-qt4-QtCore-QtCore.pro b/cad/klayout/files/patch-src-gsiqt-qt4-QtCore-QtCore.pro
new file mode 100644
index 000000000000..02d5670274aa
--- /dev/null
+++ b/cad/klayout/files/patch-src-gsiqt-qt4-QtCore-QtCore.pro
@@ -0,0 +1,11 @@
+--- src/gsiqt/qt4/QtCore/QtCore.pro.orig	2021-08-28 16:41:29 UTC
++++ src/gsiqt/qt4/QtCore/QtCore.pro
+@@ -11,7 +11,7 @@ DEFINES += MAKE_GSI_QTCORE_LIBRARY
+ INCLUDEPATH += $$TL_INC $$GSI_INC $$DB_INC $$QTBASIC_INC
+ DEPENDPATH += $$TL_INC $$GSI_INC $$DB_INC $$QTBASIC_INC
+ 
+-LIBS += -L$$DESTDIR -lklayout_tl -lklayout_gsi -lklayout_qtbasic
++LIBS += $$DESTDIR/libklayout_tl.so $$DESTDIR/libklayout_gsi.so $$DESTDIR/libklayout_qtbasic.so
+ 
+ SOURCES += \
+   gsiDeclQtCoreAdd.cc
diff --git a/cad/klayout/files/patch-src-gsiqt-qt4-QtDesigner-QtDesigner.pro b/cad/klayout/files/patch-src-gsiqt-qt4-QtDesigner-QtDesigner.pro
new file mode 100644
index 000000000000..806822847a15
--- /dev/null
+++ b/cad/klayout/files/patch-src-gsiqt-qt4-QtDesigner-QtDesigner.pro
@@ -0,0 +1,11 @@
+--- src/gsiqt/qt4/QtDesigner/QtDesigner.pro.orig	2021-08-28 16:41:02 UTC
++++ src/gsiqt/qt4/QtDesigner/QtDesigner.pro
+@@ -10,7 +10,7 @@ DEFINES += MAKE_GSI_QTDESIGNER_LIBRARY
+ INCLUDEPATH += $$TL_INC $$GSI_INC $$QTBASIC_INC
+ DEPENDPATH += $$TL_INC $$GSI_INC $$QTBASIC_INC
+ 
+-LIBS += -L$$DESTDIR -lklayout_tl -lklayout_gsi -lklayout_qtbasic
++LIBS += $$DESTDIR/libklayout_tl.so $$DESTDIR/libklayout_gsi.so $$DESTDIR/libklayout_qtbasic.so
+ 
+ SOURCES += \
+ 
diff --git a/cad/klayout/files/patch-src-gsiqt-qt4-QtGui-QtGui.pro b/cad/klayout/files/patch-src-gsiqt-qt4-QtGui-QtGui.pro
new file mode 100644
index 000000000000..2dfebd8b9d5f
--- /dev/null
+++ b/cad/klayout/files/patch-src-gsiqt-qt4-QtGui-QtGui.pro
@@ -0,0 +1,17 @@
+--- src/gsiqt/qt4/QtGui/QtGui.pro.orig	2021-08-28 16:43:12 UTC
++++ src/gsiqt/qt4/QtGui/QtGui.pro
+@@ -10,12 +10,12 @@ DEFINES += MAKE_GSI_QTGUI_LIBRARY
+ INCLUDEPATH += $$TL_INC $$GSI_INC $$QTBASIC_INC
+ DEPENDPATH += $$TL_INC $$GSI_INC $$QTBASIC_INC
+ 
+-LIBS += -L$$DESTDIR -lklayout_tl -lklayout_gsi -lklayout_qtbasic
++LIBS += $$DESTDIR/libklayout_tl.so $$DESTDIR/libklayout_gsi.so $$DESTDIR/libklayout_qtbasic.so
+ 
+ # there are some bridges between db and Qt, hence this:
+ INCLUDEPATH += $$DB_INC
+ DEPENDPATH += $$DB_INC
+-LIBS += -lklayout_db
++LIBS += $$DESTDIR/libklayout_db.so
+ 
+ SOURCES += \
+   gsiDeclQtGuiAdd.cc
diff --git a/cad/klayout/files/patch-src-gsiqt-qt4-QtNetwork-QtNetwork.pro b/cad/klayout/files/patch-src-gsiqt-qt4-QtNetwork-QtNetwork.pro
new file mode 100644
index 000000000000..9f7ba4d261e8
--- /dev/null
+++ b/cad/klayout/files/patch-src-gsiqt-qt4-QtNetwork-QtNetwork.pro
@@ -0,0 +1,15 @@
+--- src/gsiqt/qt4/QtNetwork/QtNetwork.pro.orig	2021-08-28 16:42:40 UTC
++++ src/gsiqt/qt4/QtNetwork/QtNetwork.pro
+@@ -10,10 +10,10 @@ DEFINES += MAKE_GSI_QTNETWORK_LIBRARY
+ INCLUDEPATH += $$TL_INC $$GSI_INC $$QTBASIC_INC
+ DEPENDPATH += $$TL_INC $$GSI_INC $$QTBASIC_INC
+ 
+-LIBS += -L$$DESTDIR -lklayout_tl -lklayout_gsi -lklayout_qtbasic
++LIBS += $$DESTDIR/libklayout_tl.so $$DESTDIR/libklayout_gsi.so $$DESTDIR/libklayout_qtbasic.so
+ 
+ # because QQbject is used as base class for many classes, we need this:
+-LIBS += -lklayout_QtCore
++LIBS += $$DESTDIR/libklayout_QtCore.so
+ 
+ SOURCES += \
+   gsiDeclQtNetworkAdd.cc
diff --git a/cad/klayout/files/patch-src-gsiqt-qt4-QtSql-QtSql.pro b/cad/klayout/files/patch-src-gsiqt-qt4-QtSql-QtSql.pro
new file mode 100644
index 000000000000..edcf6c64f6a3
--- /dev/null
+++ b/cad/klayout/files/patch-src-gsiqt-qt4-QtSql-QtSql.pro
@@ -0,0 +1,15 @@
+--- src/gsiqt/qt4/QtSql/QtSql.pro.orig	2021-08-28 16:41:59 UTC
++++ src/gsiqt/qt4/QtSql/QtSql.pro
+@@ -10,10 +10,10 @@ DEFINES += MAKE_GSI_QTSQL_LIBRARY
+ INCLUDEPATH += $$TL_INC $$GSI_INC $$QTBASIC_INC
+ DEPENDPATH += $$TL_INC $$GSI_INC $$QTBASIC_INC
+ 
+-LIBS += -L$$DESTDIR -lklayout_tl -lklayout_gsi -lklayout_qtbasic
++LIBS += $$DESTDIR/libklayout_tl.so $$DESTDIR/libklayout_gsi.so $$DESTDIR/libklayout_qtbasic.so
+ 
+ # because QAsbtractTableModel is used as base class, we need this:
+-LIBS += -lklayout_QtCore
++LIBS += $$DESTDIR/libklayout_QtCore.so
+ 
+ SOURCES += \
+ 
diff --git a/cad/klayout/files/patch-src-gsiqt-qt4-QtUiTools-QtUiTools.pro b/cad/klayout/files/patch-src-gsiqt-qt4-QtUiTools-QtUiTools.pro
new file mode 100644
index 000000000000..4457acda9d11
--- /dev/null
+++ b/cad/klayout/files/patch-src-gsiqt-qt4-QtUiTools-QtUiTools.pro
@@ -0,0 +1,11 @@
+--- src/gsiqt/qt4/QtUiTools/QtUiTools.pro.orig	2021-08-28 16:40:31 UTC
++++ src/gsiqt/qt4/QtUiTools/QtUiTools.pro
+@@ -10,7 +10,7 @@ DEFINES += MAKE_GSI_QTUITOOLS_LIBRARY
+ INCLUDEPATH += $$TL_INC $$GSI_INC $$QTBASIC_INC
+ DEPENDPATH += $$TL_INC $$GSI_INC $$QTBASIC_INC
+ 
+-LIBS += -L$$DESTDIR -lklayout_tl -lklayout_gsi -lklayout_qtbasic
++LIBS += $$DESTDIR/libklayout_tl.so $$DESTDIR/libklayout_gsi.so $$DESTDIR/libklayout_qtbasic.so
+ 
+ SOURCES += \
+ 
diff --git a/cad/klayout/files/patch-src-gsiqt-qt4-QtXml-QtXml.pro b/cad/klayout/files/patch-src-gsiqt-qt4-QtXml-QtXml.pro
new file mode 100644
index 000000000000..49591e14c41b
--- /dev/null
+++ b/cad/klayout/files/patch-src-gsiqt-qt4-QtXml-QtXml.pro
@@ -0,0 +1,11 @@
+--- src/gsiqt/qt4/QtXml/QtXml.pro.orig	2021-08-28 16:39:58 UTC
++++ src/gsiqt/qt4/QtXml/QtXml.pro
+@@ -10,7 +10,7 @@ DEFINES += MAKE_GSI_QTXML_LIBRARY
+ INCLUDEPATH += $$TL_INC $$GSI_INC $$QTBASIC_INC
+ DEPENDPATH += $$TL_INC $$GSI_INC $$QTBASIC_INC
+ 
+-LIBS += -L$$DESTDIR -lklayout_tl -lklayout_gsi -lklayout_qtbasic
++LIBS += $$DESTDIR/libklayout_tl.so $$DESTDIR/libklayout_gsi.so $$DESTDIR/libklayout_qtbasic.so
+ 
+ SOURCES += \
+ 
diff --git a/cad/klayout/files/patch-src-gsiqt-qt5-QtCore-QtCore.pro b/cad/klayout/files/patch-src-gsiqt-qt5-QtCore-QtCore.pro
new file mode 100644
index 000000000000..53184bdf2d51
--- /dev/null
+++ b/cad/klayout/files/patch-src-gsiqt-qt5-QtCore-QtCore.pro
@@ -0,0 +1,11 @@
+--- src/gsiqt/qt5/QtCore/QtCore.pro.orig	2021-08-28 16:29:54 UTC
++++ src/gsiqt/qt5/QtCore/QtCore.pro
+@@ -11,7 +11,7 @@ DEFINES += MAKE_GSI_QTCORE_LIBRARY
+ INCLUDEPATH += $$TL_INC $$GSI_INC $$DB_INC $$QTBASIC_INC
+ DEPENDPATH += $$TL_INC $$GSI_INC $$DB_INC $$QTBASIC_INC
+ 
+-LIBS += -L$$DESTDIR -lklayout_tl -lklayout_gsi -lklayout_qtbasic
++LIBS += $$DESTDIR/libklayout_tl.so $$DESTDIR/libklayout_gsi.so $$DESTDIR/libklayout_qtbasic.so
+ 
+ SOURCES += \
+   gsiDeclQtCoreAdd.cc
diff --git a/cad/klayout/files/patch-src-gsiqt-qt5-QtDesigner-QtDesigner.pro b/cad/klayout/files/patch-src-gsiqt-qt5-QtDesigner-QtDesigner.pro
new file mode 100644
index 000000000000..ba456452cee8
--- /dev/null
+++ b/cad/klayout/files/patch-src-gsiqt-qt5-QtDesigner-QtDesigner.pro
@@ -0,0 +1,11 @@
+--- src/gsiqt/qt5/QtDesigner/QtDesigner.pro.orig	2021-08-28 17:27:01 UTC
++++ src/gsiqt/qt5/QtDesigner/QtDesigner.pro
+@@ -10,7 +10,7 @@ DEFINES += MAKE_GSI_QTDESIGNER_LIBRARY
+ INCLUDEPATH += $$TL_INC $$GSI_INC $$QTBASIC_INC
+ DEPENDPATH += $$TL_INC $$GSI_INC $$QTBASIC_INC
+ 
+-LIBS += -L$$DESTDIR -lklayout_tl -lklayout_gsi -lklayout_qtbasic
++LIBS += $$DESTDIR/libklayout_tl.so $$DESTDIR/libklayout_gsi.so $$DESTDIR/libklayout_qtbasic.so
+ 
+ SOURCES += \
+ 
diff --git a/cad/klayout/files/patch-src-gsiqt-qt5-QtGui-QtGui.pro b/cad/klayout/files/patch-src-gsiqt-qt5-QtGui-QtGui.pro
new file mode 100644
index 000000000000..b7cf76160e64
--- /dev/null
+++ b/cad/klayout/files/patch-src-gsiqt-qt5-QtGui-QtGui.pro
@@ -0,0 +1,21 @@
+--- src/gsiqt/qt5/QtGui/QtGui.pro.orig	2021-08-28 16:33:45 UTC
++++ src/gsiqt/qt5/QtGui/QtGui.pro
+@@ -10,15 +10,15 @@ DEFINES += MAKE_GSI_QTGUI_LIBRARY
+ INCLUDEPATH += $$TL_INC $$GSI_INC $$QTBASIC_INC
+ DEPENDPATH += $$TL_INC $$GSI_INC $$QTBASIC_INC
+ 
+-LIBS += -L$$DESTDIR -lklayout_tl -lklayout_gsi -lklayout_qtbasic
++LIBS += $$DESTDIR/libklayout_tl.so $$DESTDIR/libklayout_gsi.so $$DESTDIR/libklayout_qtbasic.so
+ 
+ # there are some bridges between db and Qt, hence this:
+ INCLUDEPATH += $$DB_INC
+ DEPENDPATH += $$DB_INC
+-LIBS += -lklayout_db
++LIBS += $$DESTDIR/libklayout_db.so
+ 
+ # because QQbject is used as base class for many classes, we need this:
+-LIBS += -lklayout_QtCore
++LIBS += $$DESTDIR/libklayout_QtCore.so
+ 
+ SOURCES += \
+   gsiDeclQtGuiAdd.cc
diff --git a/cad/klayout/files/patch-src-gsiqt-qt5-QtMultimedia-QtMultimedia.pro b/cad/klayout/files/patch-src-gsiqt-qt5-QtMultimedia-QtMultimedia.pro
new file mode 100644
index 000000000000..c0b0db205b7e
--- /dev/null
+++ b/cad/klayout/files/patch-src-gsiqt-qt5-QtMultimedia-QtMultimedia.pro
@@ -0,0 +1,19 @@
+--- src/gsiqt/qt5/QtMultimedia/QtMultimedia.pro.orig	2021-08-28 16:38:53 UTC
++++ src/gsiqt/qt5/QtMultimedia/QtMultimedia.pro
+@@ -10,13 +10,13 @@ DEFINES += MAKE_GSI_QTMULTIMEDIA_LIBRARY
+ INCLUDEPATH += $$TL_INC $$GSI_INC $$QTBASIC_INC
+ DEPENDPATH += $$TL_INC $$GSI_INC $$QTBASIC_INC
+ 
+-LIBS += -L$$DESTDIR -lklayout_tl -lklayout_gsi -lklayout_qtbasic
++LIBS += $$DESTDIR/libklayout_tl.so $$DESTDIR/libklayout_gsi.so $$DESTDIR/libklayout_qtbasic.so
+ 
+ # because QQbject is used as base class for many classes, we need this:
+-LIBS += -lklayout_QtCore
++LIBS += $$DESTDIR/libklayout_QtCore.so
+ 
+ # because QWidget is used for some UI stuff, we need this:
+-LIBS += -lklayout_QtWidgets
++LIBS += $$DESTDIR/libklayout_QtWidgets.so
+ 
+ SOURCES += \
+ 
diff --git a/cad/klayout/files/patch-src-gsiqt-qt5-QtNetwork-QtNetwork.pro b/cad/klayout/files/patch-src-gsiqt-qt5-QtNetwork-QtNetwork.pro
new file mode 100644
index 000000000000..4336d7be56a7
--- /dev/null
+++ b/cad/klayout/files/patch-src-gsiqt-qt5-QtNetwork-QtNetwork.pro
@@ -0,0 +1,15 @@
+--- src/gsiqt/qt5/QtNetwork/QtNetwork.pro.orig	2021-08-28 16:32:44 UTC
++++ src/gsiqt/qt5/QtNetwork/QtNetwork.pro
+@@ -10,10 +10,10 @@ DEFINES += MAKE_GSI_QTNETWORK_LIBRARY
+ INCLUDEPATH += $$TL_INC $$GSI_INC $$QTBASIC_INC
+ DEPENDPATH += $$TL_INC $$GSI_INC $$QTBASIC_INC
+ 
+-LIBS += -L$$DESTDIR -lklayout_tl -lklayout_gsi -lklayout_qtbasic
++LIBS += $$DESTDIR/libklayout_tl.so $$DESTDIR/libklayout_gsi.so $$DESTDIR/libklayout_qtbasic.so
+ 
+ # because QQbject is used as base class for many classes, we need this:
+-LIBS += -lklayout_QtCore
++LIBS += $$DESTDIR/libklayout_QtCore.so
+ 
+ SOURCES += \
+   gsiDeclQtNetworkAdd.cc
diff --git a/cad/klayout/files/patch-src-gsiqt-qt5-QtPrintSupport-QtPrintSupport.pro b/cad/klayout/files/patch-src-gsiqt-qt5-QtPrintSupport-QtPrintSupport.pro
new file mode 100644
index 000000000000..b48e11482537
--- /dev/null
+++ b/cad/klayout/files/patch-src-gsiqt-qt5-QtPrintSupport-QtPrintSupport.pro
@@ -0,0 +1,23 @@
+--- src/gsiqt/qt5/QtPrintSupport/QtPrintSupport.pro.orig	2021-08-28 16:37:50 UTC
++++ src/gsiqt/qt5/QtPrintSupport/QtPrintSupport.pro
+@@ -10,16 +10,16 @@ DEFINES += MAKE_GSI_QTPRINTSUPPORT_LIBRARY
+ INCLUDEPATH += $$TL_INC $$GSI_INC $$QTBASIC_INC
+ DEPENDPATH += $$TL_INC $$GSI_INC $$QTBASIC_INC
+ 
+-LIBS += -L$$DESTDIR -lklayout_tl -lklayout_gsi -lklayout_qtbasic
++LIBS += $$DESTDIR/libklayout_tl.so $$DESTDIR/libklayout_gsi.so $$DESTDIR/libklayout_qtbasic.so
+ 
+ # because QQbject is used as base class for many classes, we need this:
+-LIBS += -lklayout_QtCore
++LIBS += $$DESTDIR/libklayout_QtCore.so
+ 
+ # because QWidget is used for some UI stuff, we need this:
+-LIBS += -lklayout_QtWidgets
++LIBS += $$DESTDIR/libklayout_QtWidgets.so
+ 
+ # because QPagedPaintDevice is used, we need this:
+-LIBS += -lklayout_QtGui
++LIBS += $$DESTDIR/libklayout_QtGui.so
+ 
+ SOURCES += \
+ 
diff --git a/cad/klayout/files/patch-src-gsiqt-qt5-QtSql-QtSql.pro b/cad/klayout/files/patch-src-gsiqt-qt5-QtSql-QtSql.pro
new file mode 100644
index 000000000000..0cf8a811697f
--- /dev/null
+++ b/cad/klayout/files/patch-src-gsiqt-qt5-QtSql-QtSql.pro
@@ -0,0 +1,15 @@
+--- src/gsiqt/qt5/QtSql/QtSql.pro.orig	2021-08-28 16:32:05 UTC
++++ src/gsiqt/qt5/QtSql/QtSql.pro
+@@ -10,10 +10,10 @@ DEFINES += MAKE_GSI_QTSQL_LIBRARY
+ INCLUDEPATH += $$TL_INC $$GSI_INC $$QTBASIC_INC
+ DEPENDPATH += $$TL_INC $$GSI_INC $$QTBASIC_INC
+ 
+-LIBS += -L$$DESTDIR -lklayout_tl -lklayout_gsi -lklayout_qtbasic
++LIBS += $$DESTDIR/libklayout_tl.so $$DESTDIR/libklayout_gsi.so $$DESTDIR/libklayout_qtbasic.so
+ 
+ # because QQbject is used as base class for many classes, we need this:
+-LIBS += -lklayout_QtCore
++LIBS += $$DESTDIR/libklayout_QtCore.so
+ 
+ SOURCES += \
+ 
diff --git a/cad/klayout/files/patch-src-gsiqt-qt5-QtSvg-QtSvg.pro b/cad/klayout/files/patch-src-gsiqt-qt5-QtSvg-QtSvg.pro
new file mode 100644
index 000000000000..d69db02c6b64
--- /dev/null
+++ b/cad/klayout/files/patch-src-gsiqt-qt5-QtSvg-QtSvg.pro
@@ -0,0 +1,23 @@
+--- src/gsiqt/qt5/QtSvg/QtSvg.pro.orig	2021-08-28 16:36:01 UTC
++++ src/gsiqt/qt5/QtSvg/QtSvg.pro
+@@ -10,16 +10,16 @@ DEFINES += MAKE_GSI_QTSVG_LIBRARY
+ INCLUDEPATH += $$TL_INC $$GSI_INC $$QTBASIC_INC
+ DEPENDPATH += $$TL_INC $$GSI_INC $$QTBASIC_INC
+ 
+-LIBS += -L$$DESTDIR -lklayout_tl -lklayout_gsi -lklayout_qtbasic
++LIBS += $$DESTDIR/libklayout_tl.so $$DESTDIR/libklayout_gsi.so $$DESTDIR/libklayout_qtbasic.so
+ 
+ # because QQbject is used as base class for many classes, we need this:
+-LIBS += -lklayout_QtCore
++LIBS += $$DESTDIR/libklayout_QtCore.so
+ 
+ # because QWidget is used for some UI stuff, we need this:
+-LIBS += -lklayout_QtWidgets
++LIBS += $$DESTDIR/libklayout_QtWidgets.so
+ 
+ # because QPaintDevice is used, we need this:
+-LIBS += -lklayout_QtGui
++LIBS += $$DESTDIR/libklayout_QtGui.so
+ 
+ SOURCES += \
+ 
diff --git a/cad/klayout/files/patch-src-gsiqt-qt5-QtUiTools-QtUiTools.pro b/cad/klayout/files/patch-src-gsiqt-qt5-QtUiTools-QtUiTools.pro
new file mode 100644
index 000000000000..96dbe2ea6ae1
--- /dev/null
+++ b/cad/klayout/files/patch-src-gsiqt-qt5-QtUiTools-QtUiTools.pro
@@ -0,0 +1,11 @@
+--- src/gsiqt/qt5/QtUiTools/QtUiTools.pro.orig	2021-08-28 16:35:24 UTC
++++ src/gsiqt/qt5/QtUiTools/QtUiTools.pro
+@@ -10,7 +10,7 @@ DEFINES += MAKE_GSI_QTUITOOLS_LIBRARY
+ INCLUDEPATH += $$TL_INC $$GSI_INC $$QTBASIC_INC
*** 2014 LINES SKIPPED ***

More information about the dev-commits-ports-main mailing list