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

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

> cmake didn't work for me - i changes some things, but i'm not a cmake expert
> :/

I tested your latest revision (r6397), but I get same behaviour "Undefined symbol"

If I add CFLAGS -lexecinfo, Midori crashes (at start time), when devpet is enabled (without error, or warning message).

Unfortunately I not able to analize coredump.

Here patches which prevent building this extension.

--- ./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)

--- ./extensions/wscript_build.orig 2013-08-14 18:32:02.000000000 +0000
+++ ./extensions/wscript_build 2013-09-17 17:55:12.000000000 +0000
@@ -4,8 +4,12 @@

 import Options
 import os
+import sys

 extensions = os.listdir ('extensions')
+if 'bsd' in sys.platform:
+ if 'devpet.vala' in extensions:
+ extensions.remove('devpet.vala')
 for extension in extensions:
     # FIXME In the absense of a proper mechanism, transfers is a stock extension
     if not bld.env['addons'] and extension != 'transfers.vala':

« Back to merge proposal