[DRE-commits] r3331 - in packages/libodbc-ruby/trunk/debian: . patches

[daigo at alioth.debian.org]

Author: daigo
Date: 2009-03-24 01:58:58 +0000 (Tue, 24 Mar 2009)
New Revision: 3331

Added:
   packages/libodbc-ruby/trunk/debian/patches/
   packages/libodbc-ruby/trunk/debian/patches/00list
   packages/libodbc-ruby/trunk/debian/patches/20090325_extconf_dlopen.dpatch
Modified:
   packages/libodbc-ruby/trunk/debian/changelog
   packages/libodbc-ruby/trunk/debian/rules
Log:
Added debian/patches/20090325_extconf_dlopen.dpatch: this enables a dlopen
check process.

Modified: packages/libodbc-ruby/trunk/debian/changelog
===================================================================
--- packages/libodbc-ruby/trunk/debian/changelog	2009-03-24 01:34:07 UTC (rev 3330)
+++ packages/libodbc-ruby/trunk/debian/changelog	2009-03-24 01:58:58 UTC (rev 3331)
@@ -10,8 +10,10 @@
     - The upstream's chanelog is now installed.
   * debian/compat
     - Bump up the compatibility level to 7.
+  * Added debian/patches/20090325_extconf_dlopen.dpatch: this enables a dlopen
+    check process.
 
- -- Daigo Moriwaki <daigo at debian.org>  Mon, 23 Mar 2009 23:10:55 +0900
+ -- Daigo Moriwaki <daigo at debian.org>  Tue, 24 Mar 2009 10:55:48 +0900
 
 libodbc-ruby (0.9996-1) unstable; urgency=low
 

Added: packages/libodbc-ruby/trunk/debian/patches/00list
===================================================================
--- packages/libodbc-ruby/trunk/debian/patches/00list	                        (rev 0)
+++ packages/libodbc-ruby/trunk/debian/patches/00list	2009-03-24 01:58:58 UTC (rev 3331)
@@ -0,0 +1 @@
+20090325_extconf_dlopen

Added: packages/libodbc-ruby/trunk/debian/patches/20090325_extconf_dlopen.dpatch
===================================================================
--- packages/libodbc-ruby/trunk/debian/patches/20090325_extconf_dlopen.dpatch	                        (rev 0)
+++ packages/libodbc-ruby/trunk/debian/patches/20090325_extconf_dlopen.dpatch	2009-03-24 01:58:58 UTC (rev 3331)
@@ -0,0 +1,31 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 20090325_extconf_dlopen.dpatch by Daigo Moriwaki <daigo at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Checking dlopen is available
+
+ at DPATCH@
+diff -urNad trunk~/extconf.rb trunk/extconf.rb
+--- trunk~/extconf.rb	2009-02-03 02:36:15.000000000 +0900
++++ trunk/extconf.rb	2009-03-24 10:52:45.000000000 +0900
+@@ -93,7 +93,7 @@
+   have_library("odbc32", "")
+   have_library("odbccp32", "")
+   have_library("user32", "")
+-elsif (testdlopen && PLATFORM !~ /(macos|darwin)/ && CONFIG["CC"] =~ /gcc/ && have_func("dlopen", "dlfcn.h") && have_library("dl", "dlopen")) then
++elsif (testdlopen && PLATFORM !~ /(macos|darwin)/ && have_func("dlopen", "dlfcn.h") && have_library("dl", "dlopen")) then
+   $LDFLAGS+=" -Wl,-init -Wl,ruby_odbc_init -Wl,-fini -Wl,ruby_odbc_fini"
+   $CPPFLAGS+=" -DHAVE_SQLCONFIGDATASOURCE"
+   $CPPFLAGS+=" -DHAVE_SQLINSTALLERERROR"
+diff -urNad trunk~/utf8/extconf.rb trunk/utf8/extconf.rb
+--- trunk~/utf8/extconf.rb	2006-09-15 14:59:52.000000000 +0900
++++ trunk/utf8/extconf.rb	2009-03-24 10:52:55.000000000 +0900
+@@ -113,7 +113,7 @@
+   have_library("odbc32", "")
+   have_library("odbccp32", "")
+   have_library("user32", "")
+-elsif (testdlopen && PLATFORM !~ /(macos|darwin)/ && CONFIG["CC"] =~ /gcc/ && have_func("dlopen", "dlfcn.h") && have_library("dl", "dlopen")) then
++elsif (testdlopen && PLATFORM !~ /(macos|darwin)/ && have_func("dlopen", "dlfcn.h") && have_library("dl", "dlopen")) then
+   $LDFLAGS+=" -Wl,-init -Wl,ruby_odbc_init -Wl,-fini -Wl,ruby_odbc_fini"
+   $CPPFLAGS+=" -DHAVE_SQLCONFIGDATASOURCE"
+   $CPPFLAGS+=" -DHAVE_SQLINSTALLERERROR"


Property changes on: packages/libodbc-ruby/trunk/debian/patches/20090325_extconf_dlopen.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Modified: packages/libodbc-ruby/trunk/debian/rules
===================================================================
--- packages/libodbc-ruby/trunk/debian/rules	2009-03-24 01:34:07 UTC (rev 3330)
+++ packages/libodbc-ruby/trunk/debian/rules	2009-03-24 01:58:58 UTC (rev 3331)
@@ -9,13 +9,14 @@
 DEB_DBG_PACKAGE_libodbc-utf8-ruby$(ruby_ver) = libodbc-utf8-ruby$(ruby_ver)-dbg
 
 include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/rules/dpatch.mk
 
 #
 # Non-UTF-8 library
 #
 
 configure/libodbc-ruby$(ruby_ver)::
-	ruby$(ruby_ver) extconf.rb
+	ruby$(ruby_ver) extconf.rb --enable-dlopen
 
 build/libodbc-ruby$(ruby_ver)::
 	$(MAKE)
@@ -33,7 +34,7 @@
 #
 
 configure/libodbc-utf8-ruby$(ruby_ver)::
-	ruby$(ruby_ver) -Cutf8 extconf.rb
+	ruby$(ruby_ver) -Cutf8 extconf.rb --enable-dlopen
 
 build/libodbc-utf8-ruby$(ruby_ver)::
 	$(MAKE) -Cutf8