From: Andrea Zagli <azagli@libero.it>
Date: Thu, 9 Apr 2015 11:36:27 +0000 (+0200)
Subject: libgda: compilazione con oracle a 64bit.
X-Git-Url: https://saetta.ns0.it/gitweb?a=commitdiff_plain;h=4989d03f6e705470684f09b4c6e7ad25cbdd79ad;p=msys2

libgda: compilazione con oracle a 64bit.
---

diff --git a/packages/mingw-w64-libgda-full/999-oracle-64bit.patch b/packages/mingw-w64-libgda-full/999-oracle-64bit.patch
new file mode 100644
index 0000000..fad04fe
--- /dev/null
+++ b/packages/mingw-w64-libgda-full/999-oracle-64bit.patch
@@ -0,0 +1,20 @@
+--- ./m4/oracle.m4.orig	2015-04-09 10:32:35.329562300 +0200
++++ ./m4/oracle.m4	2015-04-09 10:33:15.247656700 +0200
+@@ -123,7 +123,7 @@
+   	        save_LIBS="$LIBS"
+ 	        if test $platform_win32 = yes
+ 		then
+-		    CFLAGS="$CFLAGS -I$d/include"
++		    CFLAGS="$CFLAGS -D__BORLANDC__ -I$d/include"
+ 	            LIBS="$LIBS -L$d/$oracle_loclibdir -lm -loci"
+ 		else
+ 	            CFLAGS="$CFLAGS -I$d/include -I$d/include/oracle/client -I$d/rdbms/demo -I${ORACLE_HOME}/rdbms/public -I${ORACLE_HOME}/plsql/public -I$d/network/public"
+@@ -146,7 +146,7 @@
+ 		AC_MSG_RESULT([found])
+ 	        if test $platform_win32 = yes
+ 		then
+-		    ORACLE_CFLAGS="-I${oracledir}/include"
++		    ORACLE_CFLAGS="-D__BORLANDC__ -I${oracledir}/include"
+ 	    	    ORACLE_LIBS="-L${oracledir}/$oracle_loclibdir -lm -loci"
+ 		else
+ 		    ORACLE_CFLAGS="-I${oracledir}/include -I${oracledir}/include/oracle/client -I${oracledir}/rdbms/demo -I${ORACLE_HOME}/rdbms/public -I${ORACLE_HOME}/plsql/public -I${oracledir}/network/public"
diff --git a/packages/mingw-w64-libgda-full/PKGBUILD b/packages/mingw-w64-libgda-full/PKGBUILD
index 0717649..fecb8af 100644
--- a/packages/mingw-w64-libgda-full/PKGBUILD
+++ b/packages/mingw-w64-libgda-full/PKGBUILD
@@ -36,13 +36,15 @@ source=(http://ftp.gnome.org/pub/gnome/sources/${_realname}/${pkgver:0:3}/${_rea
         002-mysql-m4.patch
         003-give-cc-to-gir-scanner.all.patch
         004-add-missing-symbols.patch
-        005-hack-convert-path-back-to-unix.patch)
+        005-hack-convert-path-back-to-unix.patch
+        999-oracle-64bit.patch)
 sha256sums=('c9b8b1c32f1011e47b73c5dcf36649aaef2f1edaa5f5d75be20d9caadc2bc3e4'
             'e61c10e41ea2b343c6a50d0cbf1f2912b9d9273882249a998f60cda2f4a94d4c'
             '5a9959715e63a82e5bf62bb3e6ffbe4d4b587094d13b671e2a676720c765e048'
             'a0a2e3ca548feedc6502f29ff0ef5f047bf2a7dabd7722011147872a5aea733b'
             '852956cb1f2cd77174b53ab56f509f4766442277d236b0e0eed5650f288d9c89'
-            '88718da49d5c9671f4b7c7ac4a859762012c723928f3ad7c7000bad776200596')
+            '88718da49d5c9671f4b7c7ac4a859762012c723928f3ad7c7000bad776200596'
+            'a06d60ae54e38fac7809b7af612f1e9ea69d38059f5135a915cd00bd634b4363')
 
 prepare() {
   cd ${_realname}-${pkgver}
@@ -53,6 +55,10 @@ prepare() {
   patch -p1 -i ${srcdir}/004-add-missing-symbols.patch
   patch -p1 -i ${srcdir}/005-hack-convert-path-back-to-unix.patch
 
+  if [ "${CARCH}" = "x86_64" ]; then
+    patch -p1 -i ${srcdir}/999-oracle-64bit.patch
+  fi
+
   autoreconf -fi
 }