Date: Mon, 14 Nov 2011 00:33:55 +0000 From: Max Brazhnikov <makc@freebsd.org> To: pav@freebsd.org Cc: cvs-ports@freebsd.org, rodrigo@bebik.net, cvs-all@freebsd.org, Raphael Kubo da Costa <rakuco@freebsd.org>, ports-committers@freebsd.org Subject: Re: cvs commit: ports/Mk bsd.cmake.mk Message-ID: <201111140033.56165.makc@freebsd.org> In-Reply-To: <1321213946.52074.21.camel@hood.oook.cz> References: <201111101950.pAAJoQOb072790@repoman.freebsd.org> <201111131948.15482.makc@freebsd.org> <1321213946.52074.21.camel@hood.oook.cz>
next in thread | previous in thread | raw e-mail | index | archive | help
--Boundary-00=_0HGwOGAPbH52hAB Content-Type: Text/Plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable On Sun, 13 Nov 2011 20:52:26 +0100, Pav Lucistnik wrote: > Max Brazhnikov p=C3=AD=C5=A1e v ne 13. 11. 2011 v 19:48 +0000: > > On Sun, 13 Nov 2011 20:13:54 +0100, Pav Lucistnik wrote: > > > This broke a couple of ports on 7.X. > >=20 > > Which ports are broken? >=20 > http://pointyhat.FreeBSD.org/errorlogs/amd64-errorlogs/a.7.20111111082237= /f > reecell-solver-3.8.0_1.log I've committed a fix. > http://pointyhat.FreeBSD.org/errorlogs/amd64-errorlogs/a.7.20111111082237/ > lmms-0.4.6_3,1.log The patch attached. It mainly fixes hardcoded -lpthread. --Boundary-00=_0HGwOGAPbH52hAB Content-Type: text/x-patch; charset="UTF-8"; name="lmms.diff" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="lmms.diff" Index: Makefile =================================================================== RCS file: /home/pcvs/ports/audio/lmms/Makefile,v retrieving revision 1.32 diff -u -r1.32 Makefile --- Makefile 17 Oct 2011 10:08:26 -0000 1.32 +++ Makefile 14 Nov 2011 00:03:59 -0000 @@ -39,7 +39,6 @@ QT_COMPONENTS= corelib gui xml moc_build uic_build rcc_build \ qmake_build USE_CMAKE= yes -CMAKE_USE_PTHREAD= yes CMAKE_ARGS= -DWANT_ALSA:BOOL=OFF \ -DWANT_CALF:BOOL=OFF \ -DWANT_CAPS:BOOL=OFF \ Index: files/patch-CMakeLists.txt =================================================================== RCS file: /home/pcvs/ports/audio/lmms/files/patch-CMakeLists.txt,v retrieving revision 1.2 diff -u -r1.2 patch-CMakeLists.txt --- files/patch-CMakeLists.txt 21 Jan 2010 21:14:47 -0000 1.2 +++ files/patch-CMakeLists.txt 14 Nov 2011 00:02:19 -0000 @@ -1,6 +1,15 @@ ---- CMakeLists.txt.orig 2009-12-25 08:49:19.000000000 +0900 -+++ CMakeLists.txt 2010-01-20 00:15:00.000000000 +0900 -@@ -334,6 +334,7 @@ +--- ./CMakeLists.txt.orig 2009-12-24 23:49:19.000000000 +0000 ++++ ./CMakeLists.txt 2011-11-13 23:33:38.620294211 +0000 +@@ -113,6 +113,8 @@ + ENDIF(NOT WIN32) + INCLUDE(${QT_USE_FILE}) + ++INCLUDE(FindThreads) ++ + # check for libsndfile + PKG_CHECK_MODULES(SNDFILE REQUIRED sndfile>=1.0.11) + IF(NOT SNDFILE_FOUND) +@@ -334,6 +336,7 @@ # check for libsamplerate IF(WANT_SYSTEM_SR) PKG_CHECK_MODULES(SAMPLERATE samplerate>=0.1.7) @@ -8,7 +17,7 @@ IF(SAMPLERATE_FOUND) SET(LMMS_HAVE_SAMPLERATE TRUE) ENDIF(SAMPLERATE_FOUND) -@@ -364,8 +365,8 @@ +@@ -364,8 +367,8 @@ # set compiler flags #SET(CMAKE_BUILD_TYPE relwithdebug) @@ -19,7 +28,7 @@ #SET(CMAKE_C_FLAGS_${CMAKE_BUILD_TYPE} "${CMAKE_C_FLAGS}") #SET(CMAKE_CXX_FLAGS_${CMAKE_BUILD_TYPE} "${CMAKE_CXX_FLAGS}") -@@ -459,7 +460,7 @@ +@@ -459,7 +462,7 @@ ENDIF(NOT LMMS_BUILD_APPLE) INSTALL(TARGETS lmms RUNTIME DESTINATION bin) Index: files/patch-plugins__zynaddsubfx__CMakeLists.txt =================================================================== RCS file: /home/pcvs/ports/audio/lmms/files/patch-plugins__zynaddsubfx__CMakeLists.txt,v retrieving revision 1.5 diff -u -r1.5 patch-plugins__zynaddsubfx__CMakeLists.txt --- files/patch-plugins__zynaddsubfx__CMakeLists.txt 12 Nov 2011 14:41:55 -0000 1.5 +++ files/patch-plugins__zynaddsubfx__CMakeLists.txt 13 Nov 2011 23:42:29 -0000 @@ -1,5 +1,5 @@ ---- plugins/zynaddsubfx/CMakeLists.txt.orig 2009-12-25 08:49:24.000000000 +0900 -+++ plugins/zynaddsubfx/CMakeLists.txt 2010-01-20 00:48:44.000000000 +0900 +--- ./plugins/zynaddsubfx/CMakeLists.txt.orig 2009-12-24 23:49:24.000000000 +0000 ++++ ./plugins/zynaddsubfx/CMakeLists.txt 2011-11-13 23:40:23.210297601 +0000 @@ -52,15 +52,13 @@ ADD_DEFINITIONS(-DASM_F2I_YES) ENDIF(LMMS_HOST_X86 OR LMMS_HOST_X86_64) @@ -23,7 +23,16 @@ ADD_LIBRARY(ZynAddSubFxCore SHARED LocalZynAddSubFx.cpp ${MXML_SRC}) -TARGET_LINK_LIBRARIES(ZynAddSubFxCore ${ZASF_CORE_LIBS} ${FFTW3F_LIBRARIES} -lz -lpthread) -+TARGET_LINK_LIBRARIES(ZynAddSubFxCore ${ZASF_CORE_LIBS} ${FFTW3F_LIBRARIES} -lz -lpthread -L${FFTW3F_LIBRARY_DIRS}) ++TARGET_LINK_LIBRARIES(ZynAddSubFxCore ${ZASF_CORE_LIBS} ${FFTW3F_LIBRARIES} -lz ${CMAKE_THREAD_LIBS_INIT} -L${FFTW3F_LIBRARY_DIRS}) IF(LMMS_BUILD_WIN32) TARGET_LINK_LIBRARIES(ZynAddSubFxCore -lwsock32) INSTALL(TARGETS ZynAddSubFxCore DESTINATION ${PLUGIN_DIR}) +@@ -106,7 +104,7 @@ + SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) + ADD_EXECUTABLE(RemoteZynAddSubFx RemoteZynAddSubFx.cpp ${ZYN_SRC_GUI}) + INSTALL(TARGETS RemoteZynAddSubFx RUNTIME DESTINATION ${PLUGIN_DIR}) +-TARGET_LINK_LIBRARIES(RemoteZynAddSubFx -L${CMAKE_CURRENT_BINARY_DIR} -lZynAddSubFxCore ${CMAKE_CURRENT_BINARY_DIR}/fltk/bin/libfltk.a) ++TARGET_LINK_LIBRARIES(RemoteZynAddSubFx -L${CMAKE_CURRENT_BINARY_DIR} -lZynAddSubFxCore ${CMAKE_CURRENT_BINARY_DIR}/fltk/bin/libfltk.a ${CMAKE_THREAD_LIBS_INIT}) + ADD_DEPENDENCIES(RemoteZynAddSubFx ZynAddSubFxCore) + + # link system libraries when on win32 --Boundary-00=_0HGwOGAPbH52hAB--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201111140033.56165.makc>