diff options
Diffstat (limited to 'cad/klayout')
| -rw-r--r-- | cad/klayout/files/patch-build.sh | 14 | ||||
| -rw-r--r-- | cad/klayout/files/patch-src-Makefile.rules | 13 |
2 files changed, 0 insertions, 27 deletions
diff --git a/cad/klayout/files/patch-build.sh b/cad/klayout/files/patch-build.sh index 07040839e32c..379b4160d2b9 100644 --- a/cad/klayout/files/patch-build.sh +++ b/cad/klayout/files/patch-build.sh @@ -28,20 +28,6 @@ if [ "$gcc_path" = "" ]; then echo "*** ERROR: unable to locate gcc in path" exit 1 -@@ -398,11 +401,11 @@ mac-*) - ;; - esac - --if [ ! -r $QTBIN/moc ]; then -+if [ ! -r $QTBIN/moc-qt4 ]; then - echo "*** ERROR: unable to locate Qt MOC in $QTBIN" - exit 1 - fi --if [ ! -r $QTBIN/uic ]; then -+if [ ! -r $QTBIN/uic-qt4 ]; then - echo "*** ERROR: unable to locate Qt UIC in $QTBIN" - exit 1 - fi @@ -463,11 +466,7 @@ else cd $CURR_DIR fi diff --git a/cad/klayout/files/patch-src-Makefile.rules b/cad/klayout/files/patch-src-Makefile.rules deleted file mode 100644 index fcb78eab81c1..000000000000 --- a/cad/klayout/files/patch-src-Makefile.rules +++ /dev/null @@ -1,13 +0,0 @@ ---- src/Makefile.rules.orig 2016-06-19 16:35:32 UTC -+++ src/Makefile.rules -@@ -73,8 +73,8 @@ ifeq ($(LOPT_TEST),) - LOPT_TEST=$(LOPT) - endif - --MOC=$(QTBIN)/moc --UIC=$(QTBIN)/uic -+MOC=$(QTBIN)/moc-qt4 -+UIC=$(QTBIN)/uic-qt4 - RCC=$(QTBIN)/rcc - - TESTSRC=$(TOP_SOURCE)/.. |