Changeset cf3ebf7a

Timestamp:

Feb 21, 2006, 12:25:40 AM (19 years ago)

Author:

Jim Gifford <clfs@…>

Branches:

clfs-1.2, clfs-2.1, clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit

Children:

d285e92

Parents:

bffaa02

Message:

r617@server (orig r615): ryan | 2005-08-05 23:49:16 -0700
Update to alter JAVA_HOME and JAVA locations in the environment when
building multilib... this needs to be done a WHOLE lot better...

File:

• scripts/funcs/multiarch-funcs.sh (modified) (4 diffs)

scripts/funcs/multiarch-funcs.sh

@@ -51 +51 @@
                     sed -e "s@lib[36][124]@lib@g"  -e "s@lib@${libdirname}@g" `
 
+   # JAVA handling ... see java-setup.sh
+   #------------------------------------
+   # TODO: This needs to be done a WHOLE lot better...
+   TMP_JAVA_HOME="${JAVA_INSTALLDIR}/jdk${JAVA_VER}"
+   if [ "${MULTIARCH}" = "Y" ]; then
+      TMP_JAVA_HOME="${TMP_JAVA_HOME}-${BUILDENV}"
+   fi
+   if [ -d "${TMP_JAVA_HOME}" ]; then
+      export JAVA_HOME="${TMP_JAVA_HOME}"
+
+      # Alter PATH
+      echo "${PATH}" | grep "${JAVA_INSTALLDIR}/jdk${JAVA_VER}" \
+         > /dev/null 2>&1 &&
+      {
+         PATH=`echo "${PATH}" | sed -e "s@${JAVA_INSTALLDIR}/jdk${JAVA_VER}\(\|-[36][124]\)@${JAVA_HOME}@g" `
+      } || {
+         PATH="${PATH}:${JAVA_HOME}/bin"
+      }
+   fi
+
 }
 
@@ -197 +217 @@
 
 use_wrapper() {
+set -x
    # Use full path
    wrapper=/usr/bin/multilib_wrapper
@@ -218 +239 @@
       fi
 
+      if [ -L ${file} ]; then
+         # eek, old wrapper symlink wasn't replaced...
+         echo "use_wrapper: error, ${file} is a symlink" 1>&2
+         return 1
+      fi
+         
+         
       # do the work
       mv ${file} ${file}-${BUILDENV} &&
-      ln -sf ${wrapper} ${file} &&
+      ln -sfnv ${wrapper} ${file} &&
       echo "   - ${file}" || {
          echo "use_wrapper: error creating ${file}" 1>&2 
@@ -227 +255 @@
 
    done
+set +x
 }