[SCM] qtruby packaging branch, multi-ruby, updated. 743858702ab34ce08575977f2c303fcfadd214d0

David Palacio dpalacio-guest at alioth.debian.org
Fri Sep 23 22:48:24 UTC 2011


The following commit has been merged in the multi-ruby branch:
commit 743858702ab34ce08575977f2c303fcfadd214d0
Author: David Palacio <dpalacio at orbitalibre.org>
Date:   Fri Sep 23 17:35:40 2011 -0500

    install two qtruby4shared libraries for each version of ruby. configure each build accordingly
---
 debian/libqtruby4shared2.install                   |    1 +
 .../Configure-QtRubyShared-Library-Name.patch      |   38 ++++++++++++++++++++
 debian/patches/series                              |    1 +
 debian/rules                                       |    6 ++-
 4 files changed, 44 insertions(+), 2 deletions(-)

diff --git a/debian/libqtruby4shared2.install b/debian/libqtruby4shared2.install
index a796790..44eebde 100644
--- a/debian/libqtruby4shared2.install
+++ b/debian/libqtruby4shared2.install
@@ -1 +1,2 @@
 usr/lib/libqtruby4shared.so.2*
+usr/lib/libqtruby4shared-ruby191.so.2*
diff --git a/debian/patches/Configure-QtRubyShared-Library-Name.patch b/debian/patches/Configure-QtRubyShared-Library-Name.patch
new file mode 100644
index 0000000..2068ec9
--- /dev/null
+++ b/debian/patches/Configure-QtRubyShared-Library-Name.patch
@@ -0,0 +1,38 @@
+Author: David Palacio <dpalacio at orbitalibre.org>
+Description: Make the name of the shared library configurable to use more than one Ruby version
+Last-Update: 2011-09-23
+Forwarded: no
+
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -27,10 +27,10 @@
+ 
+ # Use 'MODULE' instead of 'SHARED' so that qtruby will be built as a bundle on Mac OS X
+ # instead of a dyld. But is this correct (rjd)? It needs testing.
+-add_library(qtruby4shared SHARED ${qtrubyshared_LIB_SRCS})
++add_library(${QTRUBY4SHAREDNAME} SHARED ${qtrubyshared_LIB_SRCS})
+ add_library(qtruby4 MODULE ${qtruby_LIB_SRCS})
+ 
+-target_link_libraries(  qtruby4shared 
++target_link_libraries(  ${QTRUBY4SHAREDNAME}
+                             ${QT_QTCORE_LIBRARY} 
+                             ${QT_QTGUI_LIBRARY} 
+                             ${RUBY_LIBRARY} 
+@@ -59,14 +59,14 @@
+                             ${SMOKE_QTNETWORK_LIBRARY} 
+                             ${SMOKE_QTDBUS_LIBRARY} 
+                             ${SMOKE_QTSVG_LIBRARY}
+-                            qtruby4shared )
++                            ${QTRUBY4SHAREDNAME} )
+ 
+ # target_link_libraries(qtrubyinternal ${QT_QTCORE_LIBRARY} ${RUBY_LIBRARY} ${QT_QTNETWORK_LIBRARY})
+ 
+ set_target_properties(qtruby4 PROPERTIES PREFIX "")
+-set_target_properties(qtruby4shared PROPERTIES VERSION 2.0.0 SOVERSION 2)
++set_target_properties(${QTRUBY4SHAREDNAME} PROPERTIES VERSION 2.0.0 SOVERSION 2)
+ 
+-install(TARGETS qtruby4shared EXPORT QtRuby4Export DESTINATION ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX} )
++install(TARGETS ${QTRUBY4SHAREDNAME} EXPORT QtRuby4Export DESTINATION ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX} )
+ install(TARGETS qtruby4 DESTINATION ${CUSTOM_RUBY_SITE_ARCH_DIR})
+ install(EXPORT QtRuby4Export DESTINATION ${CMAKE_INSTALL_PREFIX}/share/qtruby4/cmake NAMESPACE QTRUBY4_ )
+ 
diff --git a/debian/patches/series b/debian/patches/series
index aa9ef00..d676066 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 use_ruby1.8.diff
 fix_ruby_requires.diff
+Configure-QtRubyShared-Library-Name.patch
diff --git a/debian/rules b/debian/rules
index 10d196b..bd0d34a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -18,11 +18,13 @@ override_dh_auto_clean:
 override_dh_auto_configure:
 	dh_auto_configure --builddirectory=$(OBJRUBY18)  -- -DRUBY_EXECUTABLE=/usr/bin/ruby1.8 \
                                                             -DCUSTOM_RUBY_SITE_LIB_DIR=/usr/lib/ruby/1.8/ \
-                                                            -DCUSTOM_RUBY_SITE_ARCH_DIR=/usr/lib/ruby/1.8/$(RUBY18_SITEARCH)
+                                                            -DCUSTOM_RUBY_SITE_ARCH_DIR=/usr/lib/ruby/1.8/$(RUBY18_SITEARCH) \
+                                                            -DQTRUBY4SHAREDNAME=qtruby4shared
 	dh_auto_configure --builddirectory=$(OBJRUBY19) -- -DRUBY_EXECUTABLE=/usr/bin/ruby1.9.1 \
                                                            -DRUBY_LIBRARY=/usr/lib/libruby-1.9.1.so \
                                                            -DCUSTOM_RUBY_SITE_LIB_DIR=/usr/lib/ruby/1.9.1/ \
-                                                           -DCUSTOM_RUBY_SITE_ARCH_DIR=/usr/lib/ruby/1.9.1/$(RUBY19_SITEARCH)
+                                                           -DCUSTOM_RUBY_SITE_ARCH_DIR=/usr/lib/ruby/1.9.1/$(RUBY19_SITEARCH) \
+                                                           -DQTRUBY4SHAREDNAME=qtruby4shared-ruby191
 
 override_dh_auto_build:
 	dh_auto_build --builddirectory=$(OBJRUBY18)

-- 
qtruby packaging



More information about the pkg-kde-commits mailing list