Mercurial > mxe-octave

changeset 3654:72a348a77be4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix native Qt build
author John W. Eaton <jwe@octave.org>
date Tue, 08 Jul 2014 10:09:50 -0400
parents 3085b1b955dd
children 4e4b0a0b5d0e
files src/qt.mk
diffstat 1 files changed, 11 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/qt.mk	Tue Jul 08 10:08:07 2014 -0400
+++ b/src/qt.mk	Tue Jul 08 10:09:50 2014 -0400
@@ -45,14 +45,22 @@
   # compile-in generic ODBC driver under Windows
   $(PKG)_CONFIGURE_DATABASE_OPTION += -plugin-sql-odbc
 else
-  $(PKG)_CONFIGURE_ENV += \
-    LDFLAGS='-Wl,-rpath-link,$(HOST_LIBDIR) -L$(HOST_LIBDIR)'
+  ifeq ($(MXE_USE_LIB64_DIRECTORY),yes)
+    $(PKG)_CONFIGURE_ENV += \
+      LDFLAGS='-Wl,-rpath-link,$(HOST_LIBDIR) -L$(HOST_LIBDIR) -Wl,-rpath-link,$(HOST_LIB64DIR) -L$(HOST_LIB64DIR)'
+  else
+    $(PKG)_CONFIGURE_ENV += \
+      LDFLAGS='-Wl,-rpath-link,$(HOST_LIBDIR) -L$(HOST_LIBDIR)'
+  endif
   $(PKG)_CONFIGURE_DATABASE_OPTION += -system-sqlite
 endif
 
 ifeq ($(MXE_NATIVE_BUILD),yes)
   $(PKG)_CONFIGURE_INCLUDE_OPTION += -I '$(HOST_INCDIR)'
   $(PKG)_CONFIGURE_LIBPATH_OPTION += -L '$(HOST_LIBDIR)'
+  ifeq ($(MXE_USE_LIB64_DIRECTORY),yes)
+    $(PKG)_CONFIGURE_LIBPATH_OPTION += -L '$(HOST_LIB64DIR)'
+  endif
   $(PKG)_CONFIGURE_INCLUDE_OPTION += -I '$(HOST_INCDIR)/dbus-1.0'
   $(PKG)_CONFIGURE_INCLUDE_OPTION += -I '$(HOST_LIBDIR)/dbus-1.0/include'
 endif
@@ -133,6 +141,7 @@
         -no-webkit \
         -no-phonon \
         -no-phonon-backend \
+        -no-javascript-jit \
         -accessibility \
         -nomake demos \
         -nomake docs \