Control: tags -1 patch
Hello,
Sekmadienis 10 Lapkritis 2013 18:20:30 rašė:
> Thanks for solving the problem with libimobiledevice; it is much
> appreicated. Unfortunately, it seems that the new version of
> clementine FTBFS on kfreebsd-{i386,amd64}:
>
> """
> Linking CXX executable ../../clementine-tagreader
> cd
> /«BUILDDIR»/clementine-1.2.0+dfsg/obj-x86_64-kfreebsd-gnu/ext/clementine-ta
> greader && /usr/bin/cmake -E cmake_link_script
> CMakeFiles/clementine-tagreader.dir/link.txt --verbose=1 /usr/bin/c++
> -DQT_NO_DEBUG_OUTPUT -DQT_NO_WARNING_OUTPUT --std=c++0x -U__STRICT_ANSI__
> -O2 -g -DNDEBUG -Wl,-z,relro
> CMakeFiles/clementine-tagreader.dir/main.cpp.o
> CMakeFiles/clementine-tagreader.dir/tagreaderworker.cpp.o
> CMakeFiles/clementine-tagreader.dir/qrc_data.cxx.o -o
> ../../clementine-tagreader -ltag -lQtCore -lQtNetwork
> ../libclementine-common/liblibclementine-common.a
> ../libclementine-tagreader/liblibclementine-tagreader.a -lexecinfo
> ../libclementine-common/liblibclementine-common.a -lprotobuf -ltag
> -lpthread /usr/bin/ld: cannot find -lexecinfo
> collect2: error: ld returned 1 exit status
> make[4]: *** [clementine-tagreader] Error 1
> [...]
> """
>
> Sadly, this failure is preventing us from benefiting from your
> libimobiledevice fix (as clementine cannot migrate to testing while it
> has out of date binaries on kfreebsd).
The attached patch is sufficient to fix this bug (tested).
--
Modestas Vainius Description: Tighten FreeBSD system name check not to match kFreeBSD
Author: Modestas Vainius
Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=729239
Origin: vendor
Last-Update: 2013-11-17
CMAKE_SYSTEM_NAME on GNU/kFreeBSD is "kFreeBSD" so we cannot use MATCHES
(regexp) operation here.
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1287,7 +1287,7 @@ if (UNIX AND NOT APPLE)
# they end up getting ignored. This appends them to the very end of the link
# line, ensuring they're always used.
find_package(X11)
- if (${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
+ if (${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD")
target_link_libraries(clementine_lib ${X11_X11_LIB})
else ()
target_link_libraries(clementine_lib ${X11_X11_LIB} ${CMAKE_DL_LIBS})
@@ -1320,9 +1320,9 @@ add_executable(clementine
main.cpp
)
-if (${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
+if (${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD")
target_link_libraries(clementine execinfo)
-endif (${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
+endif (${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD")
target_link_libraries(clementine
clementine_lib
--- a/ext/clementine-tagreader/CMakeLists.txt
+++ b/ext/clementine-tagreader/CMakeLists.txt
@@ -33,11 +33,11 @@ target_link_libraries(clementine-tagread
libclementine-tagreader
)
-if(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
+if(${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD")
target_link_libraries(clementine-tagreader
execinfo
)
-endif(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
+endif(${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD")
if(APPLE)
target_link_libraries(clementine-tagreader
signature.asc
Description: This is a digitally signed message part.