diff options
| author | Tijl Coosemans <tijl@FreeBSD.org> | 2014-08-10 19:50:23 +0000 |
|---|---|---|
| committer | Tijl Coosemans <tijl@FreeBSD.org> | 2014-08-10 19:50:23 +0000 |
| commit | 3b7bd0a1490f574288fc9a02617a19cf238254e0 (patch) | |
| tree | c05d182f965de6bace293ed87ece71bd45e7c422 /cad | |
| parent | 913e08e52dca0eafb130dc0942c6275a178095ea (diff) | |
| download | ports-3b7bd0a1490f574288fc9a02617a19cf238254e0.tar.gz ports-3b7bd0a1490f574288fc9a02617a19cf238254e0.zip | |
Fix problems with missing libs when the linker enforces explicit linking
(a* to d* categories)
PR: 192062
Notes
Notes:
svn path=/head/; revision=364564
Diffstat (limited to 'cad')
| -rw-r--r-- | cad/klayout/files/patch-config-Makefile.conf | 14 | ||||
| -rw-r--r-- | cad/openvsp/files/patch-vsp-CMakeLists.txt | 10 |
2 files changed, 17 insertions, 7 deletions
diff --git a/cad/klayout/files/patch-config-Makefile.conf b/cad/klayout/files/patch-config-Makefile.conf index 5de90c7232d9..f75b6e01dd51 100644 --- a/cad/klayout/files/patch-config-Makefile.conf +++ b/cad/klayout/files/patch-config-Makefile.conf @@ -2,7 +2,7 @@ +++ config/Makefile.conf.freebsd-32-gcc-release 2013-04-27 17:37:10.000000000 +0900 @@ -0,0 +1,49 @@ + -+# Configuration file for ++# Configuration file for +# gcc, FreeBSD +# release build + @@ -11,12 +11,12 @@ +AR=ar -r + +# Compiler general -+INC=-I$(TOP_SOURCE) -I$(SOURCE) -I. -I$(QTINCLUDE) ++INC=-I$(TOP_SOURCE) -I$(SOURCE) -I. -I$(QTINCLUDE) +DEFS=-DQT_THREAD_SUPPORT -DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_TO_ASCII + +# C++ +CXX?=gcc -+CXXOPT_DEP=-MM -MG ++CXXOPT_DEP=-MM -MG +CXXWARN=-Wall -Wno-deprecated -Woverloaded-virtual \ + -Wsign-promo -Wsynth -Wno-long-long -Wno-strict-aliasing +CXXOPT=${CXXFLAGS} -c -o @@ -24,17 +24,17 @@ + +# C +CC?=gcc -+CCOPT_DEP=-MM -MG ++CCOPT_DEP=-MM -MG +CCWARN= +CCOPT=${CFLAGS} -c -o +CCOPT_SO=-fPIC $(CCOPT) + +# Linker -+LINK?=${CC} ++LINK?=${CXX} +LOPT=${LDFLAGS} -g -Wl,-E -o -+LOPT_SO=${LDFLAGS} -g -shared -fPIC -o ++LOPT_SO=${LDFLAGS} -g -shared -o + -+LIBS=${PTHREAD_LIBS} -L$(QTLIB) -lQtGui -lQtCore -lQtXml -lQtNetwork -lQtSql -lQtDesigner -lrt -lstdc++ -lcrypt -lz ++LIBS=${PTHREAD_LIBS} -L$(QTLIB) -lQtGui -lQtCore -lQtXml -lQtNetwork -lQtSql -lQtDesigner -lrt -lm -lcrypt -lz + +.PHONY: install +install: diff --git a/cad/openvsp/files/patch-vsp-CMakeLists.txt b/cad/openvsp/files/patch-vsp-CMakeLists.txt new file mode 100644 index 000000000000..fcd38f6a195b --- /dev/null +++ b/cad/openvsp/files/patch-vsp-CMakeLists.txt @@ -0,0 +1,10 @@ +--- src/vsp/CMakeLists.txt.orig 2014-08-08 15:23:12.000000000 +0200 ++++ src/vsp/CMakeLists.txt 2014-08-08 15:23:59.000000000 +0200 +@@ -216,6 +216,7 @@ + ${FLTK_LIBRARIES} + ${OPENGL_LIBRARIES} + ${OPENNURBS_LIBRARIES} ++ -pthread + ) + + INSTALL( TARGETS vsp RUNTIME DESTINATION . ) |