Cleanup new JDK directory support in GCJ.

2009-03-03 Andrew John Hughes <ahughes@redhat.com> * Makefile.am: Remove dangling src.zip and javac symlinks. Fix java.security symlink to use toolexeclibdir as classpath/resource/Makefile.am does. * Makefile.in, * configure: Regenerated. * configure.ac: Drop hard-coded prefix, thus removing sdk_dir and making jre_dir="jre". Map x86_64 to amd64 as used by OpenJDK. * gcj/Makefile.in, * include/Makefile.in, * testsuite/Makefile.in: Regenerated. From-SVN: r144576

Cleanup new JDK directory support in GCJ.
2009-03-03 Andrew John Hughes <ahughes@redhat.com> * Makefile.am: Remove dangling src.zip and javac symlinks. Fix java.security symlink to use toolexeclibdir as classpath/resource/Makefile.am does. * Makefile.in, * configure: Regenerated. * configure.ac: Drop hard-coded prefix, thus removing sdk_dir and making jre_dir="jre". Map x86_64 to amd64 as used by OpenJDK. * gcj/Makefile.in, * include/Makefile.in, * testsuite/Makefile.in: Regenerated. From-SVN: r144576
6eaf85d0 · Andrew John Hughes · Andrew John Hughes · 067dd3c9 · 6eaf85d0 · 6eaf85d0
Commit 6eaf85d0 authored Mar 03, 2009 by Andrew John Hughes Committed by Andrew John Hughes Mar 03, 2009
8 changed files
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
+2009-03-03  Andrew John Hughes  <ahughes@redhat.com>
+
+	* Makefile.am:
+	Remove dangling src.zip and javac symlinks.
+	Fix java.security symlink to use toolexeclibdir
+	as classpath/resource/Makefile.am does.
+	* Makefile.in,
+	* configure: Regenerated.
+	* configure.ac: Drop hard-coded prefix,
+	thus removing sdk_dir and making jre_dir="jre".
+	Map x86_64 to amd64 as used by OpenJDK.
+	* gcj/Makefile.in,
+	* include/Makefile.in,
+	* testsuite/Makefile.in: Regenerated.
+	
 2009-03-01  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>

 	* configure: Regenerate.

--- a/libjava/Makefile.am
+++ b/libjava/Makefile.am
@@ -586,7 +586,6 @@ if CREATE_JAVA_HOME
 	  $(DESTDIR)$(SDK_BIN_DIR)/rmic; \
 	ln -sf $$RELATIVE/`echo gjavah | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'` \
 	  $(DESTDIR)$(SDK_BIN_DIR)/javah; \
-	ln -sf $$RELATIVE/ecj $(DESTDIR)$(SDK_BIN_DIR)/javac; \
 	ln -sf $$RELATIVE/`echo gappletviewer | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'` \
 	  $(DESTDIR)$(SDK_BIN_DIR)/appletviewer; \
 	ln -sf $$RELATIVE/`echo gjarsigner | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'` \
@@ -638,7 +637,7 @@ if CREATE_JAVA_HOME
 	  done; \
 	cd $$working_dir; \
 	$(mkinstalldirs) $(DESTDIR)$(JRE_LIB_DIR)/security; \
-	RELATIVE=$$(relative $(DESTDIR)$(libdir)/security \
+	RELATIVE=$$(relative $(DESTDIR)$(toolexeclibdir)/security \
 	  $(DESTDIR)$(JRE_LIB_DIR)/security); \
 	cd $(DESTDIR)$(JRE_LIB_DIR)/security; \
 	  ln -sf $$RELATIVE/classpath.security java.security; \
@@ -684,9 +683,7 @@ if CREATE_JAVA_HOME
 	    $(DESTDIR)$(SDK_INCLUDE_DIR)/linux/$$headername.h; \
 	done; \
 	RELATIVE=$$(relative $(DESTDIR)$(datadir)/java \
-	  $(DESTDIR)$(JVM_ROOT_DIR)/$(SDK_DIR)); \
-	ln -sf $$RELATIVE/src-$(gcc_version).zip \
-	  $(DESTDIR)$(JVM_ROOT_DIR)/$(SDK_DIR)/src.zip;
+	  $(DESTDIR)$(JVM_ROOT_DIR)/$(SDK_DIR)); 
 endif

 ## ################################################################

--- a/libjava/Makefile.in
+++ b/libjava/Makefile.in
@@ -743,7 +743,6 @@ PKG_CONFIG = @PKG_CONFIG@
 PLATFORM = @PLATFORM@
 RANLIB = @RANLIB@
 SDK_BIN_DIR = @SDK_BIN_DIR@
-SDK_DIR = @SDK_DIR@
 SDK_INCLUDE_DIR = @SDK_INCLUDE_DIR@
 SDK_LIB_DIR = @SDK_LIB_DIR@
 SDK_LNK = @SDK_LNK@
@@ -12434,7 +12433,6 @@ install-data-local:
 @CREATE_JAVA_HOME_TRUE@	  $(DESTDIR)$(SDK_BIN_DIR)/rmic; \
 @CREATE_JAVA_HOME_TRUE@	ln -sf $$RELATIVE/`echo gjavah | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'` \
 @CREATE_JAVA_HOME_TRUE@	  $(DESTDIR)$(SDK_BIN_DIR)/javah; \
-@CREATE_JAVA_HOME_TRUE@	ln -sf $$RELATIVE/ecj $(DESTDIR)$(SDK_BIN_DIR)/javac; \
 @CREATE_JAVA_HOME_TRUE@	ln -sf $$RELATIVE/`echo gappletviewer | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'` \
 @CREATE_JAVA_HOME_TRUE@	  $(DESTDIR)$(SDK_BIN_DIR)/appletviewer; \
 @CREATE_JAVA_HOME_TRUE@	ln -sf $$RELATIVE/`echo gjarsigner | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'` \
@@ -12486,7 +12484,7 @@ install-data-local:
 @CREATE_JAVA_HOME_TRUE@	  done; \
 @CREATE_JAVA_HOME_TRUE@	cd $$working_dir; \
 @CREATE_JAVA_HOME_TRUE@	$(mkinstalldirs) $(DESTDIR)$(JRE_LIB_DIR)/security; \
-@CREATE_JAVA_HOME_TRUE@	RELATIVE=$$(relative $(DESTDIR)$(libdir)/security \
+@CREATE_JAVA_HOME_TRUE@	RELATIVE=$$(relative $(DESTDIR)$(toolexeclibdir)/security \
 @CREATE_JAVA_HOME_TRUE@	  $(DESTDIR)$(JRE_LIB_DIR)/security); \
 @CREATE_JAVA_HOME_TRUE@	cd $(DESTDIR)$(JRE_LIB_DIR)/security; \
 @CREATE_JAVA_HOME_TRUE@	  ln -sf $$RELATIVE/classpath.security java.security; \
@@ -12532,9 +12530,7 @@ install-data-local:
 @CREATE_JAVA_HOME_TRUE@	    $(DESTDIR)$(SDK_INCLUDE_DIR)/linux/$$headername.h; \
 @CREATE_JAVA_HOME_TRUE@	done; \
 @CREATE_JAVA_HOME_TRUE@	RELATIVE=$$(relative $(DESTDIR)$(datadir)/java \
-@CREATE_JAVA_HOME_TRUE@	  $(DESTDIR)$(JVM_ROOT_DIR)/$(SDK_DIR)); \
-@CREATE_JAVA_HOME_TRUE@	ln -sf $$RELATIVE/src-$(gcc_version).zip \
-@CREATE_JAVA_HOME_TRUE@	  $(DESTDIR)$(JVM_ROOT_DIR)/$(SDK_DIR)/src.zip;
+@CREATE_JAVA_HOME_TRUE@	  $(DESTDIR)$(JVM_ROOT_DIR)/$(SDK_DIR)); 

 maintainer-check: libgcj.la
 	$(NM) .libs/libgcj.a | grep ' T ' \

--- a/libjava/configure
+++ b/libjava/configure
--- a/libjava/configure.ac
+++ b/libjava/configure.ac
@@ -1809,8 +1809,7 @@ then
  AC_SUBST(BUILD_VERSION)
  AC_MSG_RESULT(Java version: ${JAVA_VERSION})

-  jre_dir=java-${JAVA_VERSION}-${origin_name}-${JAVA_VERSION}.${BUILD_VERSION}${arch_suffix}/jre
-  sdk_dir=java-${JAVA_VERSION}-${origin_name}-${JAVA_VERSION}.${BUILD_VERSION}${arch_suffix}
+  jre_dir=jre
  jre_lnk=jre-${JAVA_VERSION}-${origin_name}
  sdk_lnk=java-${JAVA_VERSION}-${origin_name}

@@ -1822,31 +1821,28 @@ then
  AC_SUBST(JVM_JAR_ROOT_DIR)
  AC_MSG_RESULT(JVM JAR ROOT directory: ${JVM_JAR_ROOT_DIR})

-  JVM_JAR_DIR=${jvm_jar_dir}/${sdk_dir}
+  JVM_JAR_DIR=${jvm_jar_dir}
  AC_SUBST(JVM_JAR_DIR)
  AC_MSG_RESULT(JVM JAR directory: ${JVM_JAR_DIR})

  JRE_DIR=${jre_dir}
  AC_SUBST(JRE_DIR)

-  SDK_DIR=${sdk_dir}
-  AC_SUBST(SDK_DIR)
-
  JRE_LNK=${jre_lnk}
  AC_SUBST(JRE_LNK)

  SDK_LNK=${sdk_lnk}
  AC_SUBST(SDK_LNK)

-  SDK_BIN_DIR=${jvm_root_dir}/${sdk_dir}/bin
+  SDK_BIN_DIR=${jvm_root_dir}/bin
  AC_SUBST(SDK_BIN_DIR)
  AC_MSG_RESULT(SDK tools directory: ${SDK_BIN_DIR})

-  SDK_LIB_DIR=${jvm_root_dir}/${sdk_dir}/lib
+  SDK_LIB_DIR=${jvm_root_dir}/lib
  AC_SUBST(SDK_LIB_DIR)
  AC_MSG_RESULT(SDK jar directory: ${SDK_LIB_DIR})

-  SDK_INCLUDE_DIR=${jvm_root_dir}/${sdk_dir}/include
+  SDK_INCLUDE_DIR=${jvm_root_dir}/include
  AC_SUBST(SDK_INCLUDE_DIR)
  AC_MSG_RESULT(SDK include directory: ${SDK_INCLUDE_DIR})

@@ -1868,7 +1864,7 @@ then
  AC_SUBST(GCJ_BIN_DIR)
  AC_MSG_RESULT(GCJ tools directory: ${GCJ_BIN_DIR})

-  echo host is ${host}
+  AC_MSG_RESULT(host is ${host})
  if test "x${host_cpu}" = "x"
  then
    case ${host} in
@@ -1876,6 +1872,8 @@ then
        host_cpu=x86;;
      i486-* | i586-* | i686-*)
        host_cpu=i386;;
+      x86_64-*)
+        host_cpu=amd64;;
      *)
        host_cpu=${host_cpu};;
    esac

--- a/libjava/gcj/Makefile.in
+++ b/libjava/gcj/Makefile.in
@@ -241,7 +241,6 @@ PKG_CONFIG = @PKG_CONFIG@
 PLATFORM = @PLATFORM@
 RANLIB = @RANLIB@
 SDK_BIN_DIR = @SDK_BIN_DIR@
-SDK_DIR = @SDK_DIR@
 SDK_INCLUDE_DIR = @SDK_INCLUDE_DIR@
 SDK_LIB_DIR = @SDK_LIB_DIR@
 SDK_LNK = @SDK_LNK@

--- a/libjava/include/Makefile.in
+++ b/libjava/include/Makefile.in
@@ -240,7 +240,6 @@ PKG_CONFIG = @PKG_CONFIG@
 PLATFORM = @PLATFORM@
 RANLIB = @RANLIB@
 SDK_BIN_DIR = @SDK_BIN_DIR@
-SDK_DIR = @SDK_DIR@
 SDK_INCLUDE_DIR = @SDK_INCLUDE_DIR@
 SDK_LIB_DIR = @SDK_LIB_DIR@
 SDK_LNK = @SDK_LNK@

--- a/libjava/testsuite/Makefile.in
+++ b/libjava/testsuite/Makefile.in
@@ -229,7 +229,6 @@ PKG_CONFIG = @PKG_CONFIG@
 PLATFORM = @PLATFORM@
 RANLIB = @RANLIB@
 SDK_BIN_DIR = @SDK_BIN_DIR@
-SDK_DIR = @SDK_DIR@
 SDK_INCLUDE_DIR = @SDK_INCLUDE_DIR@
 SDK_LIB_DIR = @SDK_LIB_DIR@
 SDK_LNK = @SDK_LNK@