Merge toolchain-2.9 into master and discard the toolchain-2.x branches?

CMakeLists.txt

@@ -62,12 +62,13 @@ ENDIF(NOT LibXML_FOUND)
 
 CONFIGURE_FILE(typelib.pc.in typelib.pc @ONLY)
 INSTALL(FILES ${CMAKE_BINARY_DIR}/typelib.pc DESTINATION lib/pkgconfig)
+INSTALL(FILES package.xml DESTINATION share/typelib)
 
 LINK_DIRECTORIES(${CMAKE_BINARY_DIR}/typelib)
 INCLUDE_DIRECTORIES(BEFORE ${CMAKE_SOURCE_DIR})
 INCLUDE_DIRECTORIES(BEFORE ${CMAKE_BINARY_DIR})
 
-FIND_PACKAGE(Boost COMPONENTS unit_test_framework system filesystem)
+FIND_PACKAGE(Boost COMPONENTS unit_test_framework system filesystem thread)
 IF(NOT Boost_FOUND)
     MESSAGE(FATAL_ERROR "please install boost or check BOOST_ROOT setting -- before building typelib")
 ELSE(NOT Boost_FOUND)

bindings/ruby/lib/typelib/gccxml.rb

@@ -1000,6 +1000,11 @@ def self.gccxml(file, options)
             if raw = options[:rawflags]
                 cmdline.concat(raw)
             end
+            if 1.size == 4
+                cmdline << "-m32"
+            else
+                cmdline << "-m64"
+            end
 
             if defs = options[:define]
                 defs.each do |str|

manifest.xml

@@ -23,12 +23,12 @@
        <depend_optional package="castxml" />
        <depend_optional package="gccxml" />
   -->
-  <depend package="boost" />
-  <depend package="facets" />
-  <depend package="libxml2" />
-  <depend package="pkg-config" />
-  <depend package="ruby-dev" />
-  <depend package="ruby-backports" />
+  <rosdep name="boost" />
+  <rosdep name="facets" />
+  <rosdep name="libxml2" />
+  <rosdep name="pkg-config" />
+  <rosdep name="ruby-dev" />
+  <rosdep name="ruby-backports" />
 
   <tags>stable</tags>
 

package.xml

@@ -1,6 +1,6 @@
 <package format="3">
   <name>typelib</name>
-  <version>1.1.1</version>
+  <version>2.9.0</version>
   <description>
       This library offers an introspection mechanism for C/C++ value-types. I.e.
       it offers a way to represent types, and to manipulate in-memory values

typelib/CMakeLists.txt

@@ -15,7 +15,7 @@ endif (NOT TYPELIB_HARDCODED_PLUGIN_PATH)
 set_source_files_properties(endianness.cc PROPERTIES
     COMPILE_FLAGS -fno-strict-aliasing)
 
-target_link_libraries(typeLib ${CMAKE_DL_LIBS} ${Boost_FILESYSTEM_LIBRARIES} ${Boost_SYSTEM_LIBRARIES})
+target_link_libraries(typeLib pthread ${CMAKE_DL_LIBS} ${Boost_FILESYSTEM_LIBRARIES} ${Boost_SYSTEM_LIBRARIES} ${Boost_THREAD_LIBRARIES})
 #TARGET_LINK_LIBRARIES(typeLib typeLang_c typeLang_tlb typeLang_idl)
 
 install(TARGETS typeLib