[Lunar-commits] <moonbase> qt4: Temporarily making java a hard depends. Make will fail if no jit.

[Dennis `stumbles` Veatch]

commit 468c76c4b5825d065cf4bb043977f37593631e47
Author: Dennis `stumbles` Veatch <stumbles at lunar-linux.org>
Date:   Wed Feb 15 10:12:03 2012 -0500

    qt4: Temporarily making java a hard depends. Make will fail if no jit.
    
    Found by keios.
---
 qt4-apps/qt4/BUILD   |    3 ++-
 qt4-apps/qt4/DEPENDS |    5 +++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/qt4-apps/qt4/BUILD b/qt4-apps/qt4/BUILD
index 20ea421..d78d9a4 100644
--- a/qt4-apps/qt4/BUILD
+++ b/qt4-apps/qt4/BUILD
@@ -25,7 +25,8 @@
   sedit "s:-Wl,-rpath,::" mkspecs/common/gcc-base-unix.conf &&
   sed -i "/^QMAKE_LFLAGS\s/s|+=|+= ${LDFLAGS}|g" mkspecs/common/gcc-base.conf &&
 
-  OPTS+=" -scripttools -no-declarative-debug" &&
+# Temporary. Make failes if no jit. Will revisit on next bump. Found by keios.
+  OPTS+=" -scripttools -no-declarative-debug -javascript-jit" &&
 
   ./configure  -confirm-license "${LICENSE_TYPE}"                  \
                -bindir "${MODULE_PREFIX}/bin"                      \
diff --git a/qt4-apps/qt4/DEPENDS b/qt4-apps/qt4/DEPENDS
index 5a0ddad..f74747c 100644
--- a/qt4-apps/qt4/DEPENDS
+++ b/qt4-apps/qt4/DEPENDS
@@ -1,5 +1,5 @@
 depends  %X
-
+depends %JAVA_SDK
 optional_depends  "dbus"       "-dbus"             "-no-dbus"       "for QtDBus module support"
 optional_depends  "%JPEG"      "-system-libjpeg"   "-qt-libjpeg"    "Use system or qt provided jpeg"
 optional_depends  "openssl"    "-openssl"          "-no-openssl"    "for Secure Sockets support"
@@ -15,7 +15,8 @@ optional_depends  "pulseaudio" ""                  ""               "for pulseau
 
 optional_depends  "gst-plugins-base"  ""  ""  "for gstreamer support / qt4-phonon module"
 
-optional_depends  "%JAVA_SDK"  "-javascript-jit"   "-no-javascript-jit" "for JIT support"
+# Temporary, saying no causes a make failure. Will revisit on next bump.
+#optional_depends  "%JAVA_SDK"  "-javascript-jit"   "-no-javascript-jit" "for JIT support"
 
 optional_depends  "mysql"                                                    \
                   "-plugin-sql-mysql -I/usr/include/mysql -L/usr/lib/mysql"  \