Mercurial > mxe-octave

changeset 3059:59401c8d25f8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
drop sql packages as qt dependancies * dist-files.mk: remove freetds.mk, libodbc++, postgresql and sqlite. * src/qt.mk: remove freetds, libodbc++ postgresq, sqlite from PKG_DEPS
author Philip Nienhuis
date Sun, 16 Jun 2013 00:27:20 +0200
parents 09c2c23f4bf2
children cbdf4575016d
files dist-files.mk src/qt.mk
diffstat 2 files changed, 3 insertions(+), 13 deletions(-) [+]
line wrap: on
line diff
--- a/dist-files.mk	Sun Jun 16 00:30:00 2013 +0200
+++ b/dist-files.mk	Sun Jun 16 00:27:20 2013 +0200
@@ -71,7 +71,6 @@
   freeglut-test.c \
   freeimage-1-fixes.patch \
   freeimage.mk \
-  freetds.mk \
   freetype.mk \
   fribidi-1-fixes.patch \
   fribidi.mk \
@@ -223,9 +222,6 @@
   libntlm.mk \
   liboauth.mk \
   liboauth-test.c \
-  libodbc++-1-libtool.patch \
-  libodbc++-1-win32.patch \
-  libodbc++.mk \
   liboil.mk \
   libpano13.mk \
   libpaper.mk \
@@ -366,8 +362,6 @@
   portaudio-1-win32.patch \
   portaudio.mk \
   portaudio-test.c \
-  postgresql-1-fixes.patch \
-  postgresql.mk \
   proj.mk \
   protobuf.mk \
   protobuf-test.cpp \
@@ -422,7 +416,6 @@
   sox.mk \
   sox-test.c \
   speex.mk \
-  sqlite.mk \
   stable-octave.mk \
   suitesparse-1.patch \
   suitesparse.mk \
--- a/src/qt.mk	Sun Jun 16 00:30:00 2013 +0200
+++ b/src/qt.mk	Sun Jun 16 00:27:20 2013 +0200
@@ -10,14 +10,14 @@
 
 ifeq ($(MXE_SYSTEM),mingw)
   ifeq ($(MXE_NATIVE_BUILD),yes)
-    $(PKG)_DEPS   := freetds openssl zlib libpng jpeg libmng tiff dbus
+    $(PKG)_DEPS   := openssl zlib libpng jpeg libmng tiff dbus
 
     $(PKG)_CONFIGURE_ENV := \
       OPENSSL_LIBS="`'$(MXE_PKG_CONFIG)' --libs-only-l openssl`" \
       QTDIR='$(HOST_PREFIX)' 
 
   else
-    $(PKG)_DEPS   := libodbc++ postgresql freetds openssl zlib libpng jpeg libmng tiff sqlite dbus
+    $(PKG)_DEPS   := openssl zlib libpng jpeg libmng tiff dbus
 
     $(PKG)_CONFIGURE_ENV := \
       OPENSSL_LIBS="`'$(MXE_PKG_CONFIG)' --libs-only-l openssl`" \
@@ -27,7 +27,7 @@
   endif
 
 else
-  $(PKG)_DEPS   := postgresql freetds openssl zlib libpng jpeg libmng tiff sqlite dbus
+  $(PKG)_DEPS   := openssl zlib libpng jpeg libmng tiff dbus
 
   $(PKG)_CONFIGURE_ENV := \
     CPPFLAGS='$(HOST_INCDIR)/dbus-1.0' \
@@ -53,7 +53,6 @@
       -no-reduce-exports \
       -no-ssse3 \
       -no-rpath \
-      -system-sqlite \
       -device-option PKG_CONFIG='$(MXE_PKG_CONFIG)' \
       -force-pkg-config  \
       -dbus-linked \
@@ -63,8 +62,6 @@
     $(PKG)_CONFIGURE_CROSS_COMPILE_OPTION := \
       -device-option CROSS_COMPILE=$(MXE_TOOL_PREFIX)
     $(PKG)_CONFIGURE_PLATFORM_OPTION := -xplatform win32-g++-4.6
-    $(PKG)_CONFIGURE_DATABASE_OPTION := \
-      -qt-sql-sqlite -qt-sql-odbc -qt-sql-psql -qt-sql-tds -D Q_USE_SYBASE 
   endif
 endif