[Lunar-commits] <moonbase-other> sun-jdk: Version bump to 7u21.

[stumbles]

commit 6821f15ccc98e28a1afea4b0f0d62d96203bf598
Author: stumbles <stumbles at lunar-linux.org>
Date: Mon, 13 May 2013 16:05:13 -0700
URL: https://github.com/lunar-linux/moonbase-other/commit/6821f15ccc98e28a1afea4b0f0d62d96203bf598

sun-jdk: Version bump to 7u21.
---
  compilers/sun-jdk/DETAILS   | +3/-3     
  compilers/sun-jdk/PRE_BUILD | +2/-2     
  compilers/swi-prolog/BUILD  | +15/-4    
  3 files changed, 20 insertions(+), 9 deletions(-)

--- a/compilers/sun-jdk/DETAILS
+++ b/compilers/sun-jdk/DETAILS
@@ -1,7 +1,7 @@
           MODULE=sun-jdk
-         VERSION=7u17
-        FVERSION=$VERSION-b02
-        DVERSION=1.7.0_17
+         VERSION=7u21
+        FVERSION=$VERSION-b11
+        DVERSION=1.7.0_21
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/jdk$DVERSION
         WEB_SITE=http://www.oracle.com/technetwork/java/javase/downloads/index.html
          LICENSE="proprietary"
--- a/compilers/sun-jdk/PRE_BUILD
+++ b/compilers/sun-jdk/PRE_BUILD
@@ -25,9 +25,9 @@ rm -f $JDK_POLICY
 exit 1
 fi &&
 if [ "$bits" = i586 ]; then
-JDK_SHA1_VFY="5c85e1be8da066481e28ed2cac8298845ec2eeab  $JDK_ARCHIVE"
+JDK_SHA1_VFY="ce05b9a7ecfe348878389671bd82ddc68eac2491  $JDK_ARCHIVE"
 else
-JDK_SHA1_VFY="d9b26c0db4e9b9d5331198830eb25582e3bb5e38  $JDK_ARCHIVE"
+JDK_SHA1_VFY="5391a86ac11dcd62849de2b354048d83881d2a94  $JDK_ARCHIVE"
 fi &&
 JDK_SHA1_TST=`sha1sum $JDK_ARCHIVE` &&
 if [ "$JDK_SHA1_VFY" != "$JDK_SHA1_TST" ]; then
--- a/compilers/swi-prolog/BUILD
+++ b/compilers/swi-prolog/BUILD
@@ -1,9 +1,12 @@
-(
 
   # looks like they use a different uudecode... don't use ours
   sedit "s:^if uudecode.*$:if false; then:" packages/jpl/configure &&
 
-  OPTS+=" --with-world" &&
+  OPTS+=" --with-world --enable-shared" &&
+
+  if module_installed %JAVA_SDK ; then
+    export JAVAC=$JAVA_HOME
+  fi &&
 
   # no idea why they catch those flags here - this breaks
   # a lot.. let's just remove the catch statement
@@ -12,6 +15,14 @@
   message "${MESSAGE_COLOR}The following 'unrecognized...' warning is alright${DEFAULT_COLOR}"
   # The configure in src/ doesn't know any --without-XYZ flags,
   # but we need to pass them on to packages/configure
-  default_build
+  default_build 
 
-) > $C_FIFO 2>&1
+#  if module_installed %JAVA_SDK ; then
+#    if [ `arch` == "x86_64" ] ; then
+#      export LD_LIBRARY_PATH="$JAVA_HOME/jre/lib/amd64:$LD_LIBRARY_PATH" && 
+#      ldconfig
+#     else
+#      export LD_LIBRARY_PATH="$JAVA_HOME/jre/lib/i386:$LD_LIBRARY_PATH" && 
+#      ldconfig
+#    fi
+#  fi