diff options
| author | wiz <wiz@pkgsrc.org> | 2013-10-20 20:25:23 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2013-10-20 20:25:23 +0000 |
| commit | 375828daed941e34ab7ab1c9581861ba11bdf0be (patch) | |
| tree | 334cd26542dbe1f5bc8a82073369e87e4669549e /editors | |
| parent | 091c146b35e9a9eb8bfc094a20284631b48efa4e (diff) | |
| download | pkgsrc-375828daed941e34ab7ab1c9581861ba11bdf0be.tar.gz | |
Fix build on NetBSD-6.99.24/amd64 with latest binutils per analysis
from Frank Kardel:
FlightCrew pulls in pthread_cancel via
/usr/include/c++/bits/gthr-default.h
/usr/include/g++/bits/gthr.h
/usr/include/g++/ext/atomicity.h
/usr/include/g++/bits/basic_string.h
/usr/include/g++/string
/usr/include/g++/random
/usr/include/g++/bits/stl_algo.h
/usr/include/g++/algorithm
/usr/pkgsrc/editors/Sigil/work/.buildlink/include/boost/utility/swap.hpp
/usr/pkgsrc/editors/Sigil/work/.buildlink/include/boost/tuple/detail/tuple_basic.hpp
/usr/pkgsrc/editors/Sigil/work/.buildlink/include/boost/tuple/tuple.hpp
/usr/pkgsrc/editors/Sigil/work/src/FlightCrew/stdafx.h
/usr/pkgsrc/editors/Sigil/work/src/FlightCrew/Result.cpp
so link against libpthread.
Diffstat (limited to 'editors')
| -rw-r--r-- | editors/Sigil/distinfo | 3 | ||||
| -rw-r--r-- | editors/Sigil/patches/patch-src_Sigil_CMakeLists.txt | 29 |
2 files changed, 31 insertions, 1 deletions
diff --git a/editors/Sigil/distinfo b/editors/Sigil/distinfo index 8736d6765fe..532be9fa52a 100644 --- a/editors/Sigil/distinfo +++ b/editors/Sigil/distinfo @@ -1,6 +1,7 @@ -$NetBSD: distinfo,v 1.22 2012/12/09 17:34:20 ryoon Exp $ +$NetBSD: distinfo,v 1.23 2013/10/20 20:25:23 wiz Exp $ SHA1 (Sigil-0.6.2-Code.zip) = 416b067ad9b17efd44e0df42bf7015a44da78497 RMD160 (Sigil-0.6.2-Code.zip) = 07b83eeda40a1c2e2b6e8ff1725d1ff440c2135a Size (Sigil-0.6.2-Code.zip) = 13047687 bytes +SHA1 (patch-src_Sigil_CMakeLists.txt) = 39961eea901fd617f63676a3b5b1fbf4171f4a38 SHA1 (patch-src_minizip_ioapi.c) = 1530d95061aad350888a37ab3215ddbf9aee72ca diff --git a/editors/Sigil/patches/patch-src_Sigil_CMakeLists.txt b/editors/Sigil/patches/patch-src_Sigil_CMakeLists.txt new file mode 100644 index 00000000000..b852d6abdd7 --- /dev/null +++ b/editors/Sigil/patches/patch-src_Sigil_CMakeLists.txt @@ -0,0 +1,29 @@ +$NetBSD: patch-src_Sigil_CMakeLists.txt,v 1.3 2013/10/20 20:25:23 wiz Exp $ + +FlightCrew pulls in pthread_cancel via +/usr/include/c++/bits/gthr-default.h +/usr/include/g++/bits/gthr.h +/usr/include/g++/ext/atomicity.h +/usr/include/g++/bits/basic_string.h +/usr/include/g++/string +/usr/include/g++/random +/usr/include/g++/bits/stl_algo.h +/usr/include/g++/algorithm +/usr/pkgsrc/editors/Sigil/work/.buildlink/include/boost/utility/swap.hpp +/usr/pkgsrc/editors/Sigil/work/.buildlink/include/boost/tuple/detail/tuple_basic.hpp +/usr/pkgsrc/editors/Sigil/work/.buildlink/include/boost/tuple/tuple.hpp +/usr/pkgsrc/editors/Sigil/work/src/FlightCrew/stdafx.h +/usr/pkgsrc/editors/Sigil/work/src/FlightCrew/Result.cpp +so link against libpthread. + +--- src/Sigil/CMakeLists.txt.orig 2012-12-06 20:02:06.000000000 +0000 ++++ src/Sigil/CMakeLists.txt +@@ -626,7 +626,7 @@ else() + add_executable( ${PROJECT_NAME} WIN32 ${ALL_SOURCES} ) + endif() + +-target_link_libraries( ${PROJECT_NAME} ${HUNSPELL_LIBRARIES} ${PCRE_LIBRARIES} tidyLib ${MINIZIP_LIBRARIES} ${BOOST_LIBS} ${XERCES_LIBRARIES} ${XERCESEXTENSIONS_LIBRARIES} ${FLIGHTCREW_LIBRARIES} ${QT_LIBRARIES} ) ++target_link_libraries( ${PROJECT_NAME} ${HUNSPELL_LIBRARIES} ${PCRE_LIBRARIES} tidyLib ${MINIZIP_LIBRARIES} ${BOOST_LIBS} ${XERCES_LIBRARIES} ${XERCESEXTENSIONS_LIBRARIES} ${FLIGHTCREW_LIBRARIES} ${QT_LIBRARIES} -lpthread) + + ############################################################################# + |