[gentoo-commits] gentoo-x86 commit in dev-db/libiodbc/files: libiodbc-3.52.8-gtk-parallel-make.patch libiodbc-3.52.8-runtime-failures.patch

[gentoo-commits] gentoo-x86 commit in dev-db/libiodbc/files: libiodbc-3.52.8-gtk-parallel-make.patch libiodbc-3.52.8-runtime-failures.patch

[Matti Bickel (mabi)]

mabi        13/01/08 22:17:03

  Added:                libiodbc-3.52.8-gtk-parallel-make.patch
                        libiodbc-3.52.8-runtime-failures.patch
  Log:
  version bump thanks to mschultz on bug #450782
  
  (Portage version: 2.2.0_alpha149/cvs/Linux x86_64, signed Manifest commit with key 0x4849EC6C)

Revision  Changes    Path
1.1                  dev-db/libiodbc/files/libiodbc-3.52.8-gtk-parallel-make.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/libiodbc/files/libiodbc-3.52.8-gtk-parallel-make.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/libiodbc/files/libiodbc-3.52.8-gtk-parallel-make.patch?rev=1.1&content-type=text/plain

Index: libiodbc-3.52.8-gtk-parallel-make.patch
===================================================================
diff -u -r iODBC-3.52.8.orig/iodbcadm/Makefile.am iODBC-3.52.8/iodbcadm/Makefile.am
--- iODBC-3.52.8.orig/iodbcadm/Makefile.am	2012-03-27 05:15:02.000000000 -0500
+++ iODBC-3.52.8/iodbcadm/Makefile.am	2013-01-08 08:12:58.639414826 -0600
@@ -96,7 +96,7 @@
 
 if GTK
 libiodbcadm_la_LIBADD	= \
-	../iodbcadm/gtk/libiodbcadm-gtk.la \
+	gtk/libiodbcadm-gtk.la \
 	$(LIBADD_DL) \
 	@GTK_LIBS@ \
 	../iodbcinst/libiodbc_common.la \
@@ -117,8 +117,8 @@
 
 iodbcadm_gtk_SOURCES	=
 iodbcadm_gtk_LDADD	= \
-	../iodbcadm/gtk/main.lo \
-	../iodbcadm/libiodbcadm.la \
+	gtk/main.lo \
+	libiodbcadm.la \
 	../iodbcinst/libiodbcinst.la \
 	../iodbc/libiodbc.la \
 	@GTK_LIBS@



1.1                  dev-db/libiodbc/files/libiodbc-3.52.8-runtime-failures.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/libiodbc/files/libiodbc-3.52.8-runtime-failures.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/libiodbc/files/libiodbc-3.52.8-runtime-failures.patch?rev=1.1&content-type=text/plain

Index: libiodbc-3.52.8-runtime-failures.patch
===================================================================
diff -u -r iODBC-3.52.8.orig/configure.in iODBC-3.52.8/configure.in
--- iODBC-3.52.8.orig/configure.in	2012-03-27 05:15:02.000000000 -0500
+++ iODBC-3.52.8/configure.in	2013-01-08 10:31:39.740041040 -0600
@@ -87,7 +87,7 @@
 AC_CONFIG_SRCDIR([include/isql.h])
 AC_CONFIG_AUX_DIR(admin)
 AC_CONFIG_MACRO_DIR(admin)
-AM_CONFIG_HEADER(include/config.h)
+AC_CONFIG_HEADER(include/config.h)
 AM_INIT_AUTOMAKE(AC_PACKAGE_TARNAME, AC_PACKAGE_VERSION)
 AC_CANONICAL_HOST
 AM_MAINTAINER_MODE
diff -u -r iODBC-3.52.8.orig/iodbcadm/gtk/administrator.c iODBC-3.52.8/iodbcadm/gtk/administrator.c
--- iODBC-3.52.8.orig/iodbcadm/gtk/administrator.c	2012-03-27 05:15:02.000000000 -0500
+++ iODBC-3.52.8/iodbcadm/gtk/administrator.c	2013-01-08 10:29:51.758462953 -0600
@@ -72,6 +72,13 @@
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#ifdef __linux
+# ifndef _GNU_SOURCE
+#  define _GNU_SOURCE  /* make sure dladdr is declared */
+# endif
+# define HAVE_DL_INFO 1
+#endif
+
 #include <iodbc.h>
 #include <dlfcn.h>
 #include <sys/stat.h>
@@ -82,7 +89,7 @@
 #include "odbc4.xpm"
 
 
-#if !defined(HAVE_DL_INFO)
+#if defined (HAVE_DLADDR) && !defined(HAVE_DL_INFO)
 typedef struct
 {
   const char *dli_fname;	/* File name of defining object.  */
@@ -90,6 +97,7 @@
   const char *dli_sname;	/* Name of nearest symbol.  */
   void *dli_saddr;		/* Exact value of nearest symbol.  */
 } Dl_info;
+
 #endif /* HAVE_DL_INFO */
 
 static char *szDriverButtons[] = {
diff -u -r iODBC-3.52.8.orig/iodbcadm/gtk/gui.h iODBC-3.52.8/iodbcadm/gtk/gui.h
--- iODBC-3.52.8.orig/iodbcadm/gtk/gui.h	2012-03-27 05:15:02.000000000 -0500
+++ iODBC-3.52.8/iodbcadm/gtk/gui.h	2013-01-08 10:30:48.124240299 -0600
@@ -219,5 +219,6 @@
 void addlistofdir_to_optionmenu(GtkWidget* widget, LPCSTR path, TDSNCHOOSER *choose_t);
 LPSTR create_keyval (HWND wnd, LPCSTR attrs, BOOL *verify_conn);
 LPSTR create_fgensetup (HWND hwnd, LPCSTR dsn, LPCSTR attrs, BOOL add, BOOL *verify_conn);
+void  create_message (HWND hwnd, LPCSTR dsn, LPCSTR text);
 
 #endif