Code review comment for lp:~midori/midori/execinfo

Revision history for this message
Olivier Duchateau (duchateau-olivier) wrote :

I'm sorry, but even patch is correct, I noticed in extensions box, this message:

/usr/local/lib/midori/libdevpet.so: Undefined symbol "backtrace_symbol"

So I think devpet need to be disable under BSD systems (we use same package).

Below new patch:

I don't know if libexecinfo.so is present in Window, perhaps we can make simpler test, like this

if (NOT ${CMAKE_SYSTEM_NAME} MATCHES "Linux")

endif ()

--- ./extensions/CMakeLists.txt.orig 2013-09-17 10:59:53.000000000 +0000
+++ ./extensions/CMakeLists.txt 2013-09-17 14:46:05.000000000 +0000
@@ -24,6 +24,13 @@
          "nsplugin-manager.vala"
          )
 endif ()
+string(FIND ${CMAKE_SYSTEM_NAME} "BSD" BEGIN)
+string(SUBSTRING ${CMAKE_SYSTEM_NAME} ${BEGIN} 3 BSD)
+if (BSD)
+ list(REMOVE_ITEM EXTENSIONS
+ "devpet.vala"
+ )
+endif ()

 foreach(UNIT_SRC ${EXTENSIONS})
     string(FIND ${UNIT_SRC} ".c" UNIT_EXTENSION)

review: Needs Fixing

« Back to merge proposal