Date: Tue, 22 Nov 2016 03:00:28 +0000 (UTC) From: Hiroki Sato <hrs@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r426774 - in head/cad/klayout: . files Message-ID: <201611220300.uAM30SGO096899@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: hrs Date: Tue Nov 22 03:00:28 2016 New Revision: 426774 URL: https://svnweb.freebsd.org/changeset/ports/426774 Log: Fix build on 9.x. Modified: head/cad/klayout/Makefile head/cad/klayout/files/patch-build.sh head/cad/klayout/files/patch-config-Makefile.conf head/cad/klayout/files/patch-src-Makefile.rules head/cad/klayout/files/patch-src-layApplication.cc head/cad/klayout/files/patch-src-tlStream.cc Modified: head/cad/klayout/Makefile ============================================================================== --- head/cad/klayout/Makefile Tue Nov 22 00:12:09 2016 (r426773) +++ head/cad/klayout/Makefile Tue Nov 22 03:00:28 2016 (r426774) @@ -10,7 +10,7 @@ COMMENT= Qt-based GDS2 Viewer LICENSE= GPLv2 -USES= compiler:c++0x gmake python:build +USES= compiler:c++0x execinfo gmake python:build USE_RUBY= yes USE_QT4= corelib designer gui network moc_build sql uic_build \ rcc_build qt3support xml @@ -33,7 +33,7 @@ do-build: cd ${WRKSRC} && \ ${SETENV} CC=${CC} CXX=${CXX} CFLAGS="${CFLAGS}" \ CXXFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS}" \ - _MAKE_JOBS="${_MAKE_JOBS}" \ + _MAKE_JOBS="${_MAKE_JOBS}" LOCALBASE="${LOCALBASE}" \ ${SH} build.sh -platform ${PLATFORMKEYWORD} \ -qtbin ${QT_PREFIX}/bin \ -qtinc ${QT_INCDIR} \ Modified: head/cad/klayout/files/patch-build.sh ============================================================================== --- head/cad/klayout/files/patch-build.sh Tue Nov 22 00:12:09 2016 (r426773) +++ head/cad/klayout/files/patch-build.sh Tue Nov 22 03:00:28 2016 (r426774) @@ -1,5 +1,5 @@ ---- build.sh.orig 2016-06-20 01:35:28.000000000 +0900 -+++ build.sh 2016-11-05 05:47:55.089440000 +0900 +--- build.sh.orig 2016-06-19 16:35:28 UTC ++++ build.sh @@ -3,7 +3,7 @@ EXEC_NAME=klayout IS_MAC="no" @@ -9,7 +9,7 @@ CURR_DIR=`pwd` PLATFORM="linux-32-gcc-release" -@@ -39,6 +39,9 @@ +@@ -39,6 +39,9 @@ Darwin*) PLATFORM="mac-yosemite-gcc-release" EXEC_HOLDER="klayout.app/Contents/MacOS" ;; @@ -19,7 +19,7 @@ *) # Assume Linux for the remaining variants case `arch` in -@@ -374,7 +377,7 @@ +@@ -374,7 +377,7 @@ if [ $HAVE_64BIT_COORD != 0 ]; then echo " 64 bit coordinates enabled" fi @@ -28,7 +28,7 @@ if [ "$gcc_path" = "" ]; then echo "*** ERROR: unable to locate gcc in path" exit 1 -@@ -398,11 +401,11 @@ +@@ -398,11 +401,11 @@ mac-*) ;; esac @@ -42,7 +42,7 @@ echo "*** ERROR: unable to locate Qt UIC in $QTBIN" exit 1 fi -@@ -463,11 +466,7 @@ +@@ -463,11 +466,7 @@ else cd $CURR_DIR fi @@ -55,7 +55,7 @@ mkdir -p $BUILD echo "WIN_CYGWIN=$WIN_CYGWIN" >$BUILD/Makefile -@@ -515,6 +514,9 @@ +@@ -515,6 +514,9 @@ echo "PYTHONINCLUDE=$PYTHONINCLUDE" >>$B echo "HAVE_PYTHON=$HAVE_PYTHON" >>$BUILD/Makefile.env echo "HAVE_QTBINDINGS=$HAVE_QTBINDINGS" >>$BUILD/Makefile.env echo "HAVE_64BIT_COORD=$HAVE_64BIT_COORD" >>$BUILD/Makefile.env @@ -65,7 +65,7 @@ echo "Building plugins: $PLUGINS" echo "" -@@ -549,12 +551,12 @@ +@@ -549,12 +551,12 @@ if [ $WIN_CYGWIN = 0 ]; then fi echo "" echo "Final binary is ready in $EXEC_FULL_PATH." Modified: head/cad/klayout/files/patch-config-Makefile.conf ============================================================================== --- head/cad/klayout/files/patch-config-Makefile.conf Tue Nov 22 00:12:09 2016 (r426773) +++ head/cad/klayout/files/patch-config-Makefile.conf Tue Nov 22 03:00:28 2016 (r426774) @@ -1,5 +1,5 @@ ---- /dev/null 2013-04-27 17:36:48.000000000 +0900 -+++ config/Makefile.conf.freebsd-32-gcc-release 2013-04-27 17:37:10.000000000 +0900 +--- config/Makefile.conf.freebsd-32-gcc-release.orig 2016-11-22 02:57:42 UTC ++++ config/Makefile.conf.freebsd-32-gcc-release @@ -0,0 +1,49 @@ + +# Configuration file for @@ -11,7 +11,7 @@ +AR=ar -r + +# Compiler general -+INC=-I$(TOP_SOURCE) -I$(SOURCE) -I. -I$(QTINCLUDE) ++INC=-I$(TOP_SOURCE) -I$(SOURCE) -I. -I$(QTINCLUDE) -isystem $(LOCALBASE)/include +DEFS=-DQT_THREAD_SUPPORT -DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_TO_ASCII + +# C++ @@ -34,7 +34,7 @@ +LOPT=${LDFLAGS} -g -Wl,-E -o +LOPT_SO=${LDFLAGS} -g -shared -o + -+LIBS=${PTHREAD_LIBS} -lexecinfo -L$(QTLIB) -lQtGui -lQtCore -lQtXml -lQtNetwork -lQtSql -lQtDesigner -lrt -lm -lcrypt -lz ++LIBS=${PTHREAD_LIBS} -L$(QTLIB) -lQtGui -lQtCore -lQtXml -lQtNetwork -lQtSql -lQtDesigner -lrt -lm -lcrypt -lz -L$(LOCALBASE)/lib -lexecinfo + +.PHONY: install +install: Modified: head/cad/klayout/files/patch-src-Makefile.rules ============================================================================== --- head/cad/klayout/files/patch-src-Makefile.rules Tue Nov 22 00:12:09 2016 (r426773) +++ head/cad/klayout/files/patch-src-Makefile.rules Tue Nov 22 03:00:28 2016 (r426774) @@ -1,8 +1,8 @@ ---- src/Makefile.rules.orig Fri Nov 9 04:31:39 2007 -+++ src/Makefile.rules Sun Jan 6 18:59:35 2008 -@@ -25,8 +25,8 @@ - CCOPTS=$(CCWARN) $(DEFS) $(CCOPT) - CCOPTS_DEP=$(DEFS) $(CCOPT_DEP) +--- 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 @@ -10,4 +10,4 @@ +UIC=$(QTBIN)/uic-qt4 RCC=$(QTBIN)/rcc - # this target must be first: + TESTSRC=$(TOP_SOURCE)/.. Modified: head/cad/klayout/files/patch-src-layApplication.cc ============================================================================== --- head/cad/klayout/files/patch-src-layApplication.cc Tue Nov 22 00:12:09 2016 (r426773) +++ head/cad/klayout/files/patch-src-layApplication.cc Tue Nov 22 03:00:28 2016 (r426774) @@ -1,5 +1,5 @@ ---- src/layApplication.cc.orig 2016-06-20 01:35:29.000000000 +0900 -+++ src/layApplication.cc 2016-11-16 08:59:47.386261000 +0900 +--- src/layApplication.cc.orig 2016-06-19 16:35:29 UTC ++++ src/layApplication.cc @@ -20,6 +20,7 @@ */ @@ -16,7 +16,7 @@ namespace lay { -@@ -351,7 +353,7 @@ +@@ -351,7 +353,7 @@ static void install_signal_handlers () act.sa_sigaction = signal_handler; sigemptyset (&act.sa_mask); act.sa_flags = SA_SIGINFO; Modified: head/cad/klayout/files/patch-src-tlStream.cc ============================================================================== --- head/cad/klayout/files/patch-src-tlStream.cc Tue Nov 22 00:12:09 2016 (r426773) +++ head/cad/klayout/files/patch-src-tlStream.cc Tue Nov 22 03:00:28 2016 (r426774) @@ -1,5 +1,5 @@ ---- src/tlStream.cc.orig 2014-03-14 22:31:20.000000000 +0900 -+++ src/tlStream.cc 2014-03-14 22:33:08.000000000 +0900 +--- src/tlStream.cc.orig 2016-06-19 16:35:29 UTC ++++ src/tlStream.cc @@ -31,6 +31,7 @@ #ifdef _WIN32 # include <io.h> @@ -8,7 +8,7 @@ #include "tlStream.h" #include "tlHttpStream.h" -@@ -624,7 +625,7 @@ +@@ -624,7 +625,7 @@ InputFile::~InputFile () #if defined(_WIN32) _close (m_fd); #else @@ -17,7 +17,7 @@ #endif m_fd = -1; } -@@ -654,7 +655,7 @@ +@@ -654,7 +655,7 @@ InputFile::reset () #elif defined(_WIN64) _lseek (m_fd, 0, SEEK_SET); #else @@ -26,7 +26,7 @@ #endif } } -@@ -1068,7 +1069,7 @@ +@@ -1068,7 +1069,7 @@ OutputFile::seek (size_t s) #elif defined(_WIN32) _lseek (m_fd, s, SEEK_SET); #else
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201611220300.uAM30SGO096899>