From 6eaf85d0018e29f7fed19301d94f2320bed63af2 Mon Sep 17 00:00:00 2001 From: Andrew John Hughes Date: Tue, 3 Mar 2009 17:03:51 +0000 Subject: [PATCH] Cleanup new JDK directory support in GCJ. 2009-03-03 Andrew John Hughes * 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 --- libjava/ChangeLog | 15 +++++++++++++++ libjava/Makefile.am | 7 ++----- libjava/Makefile.in | 8 ++------ libjava/configure | 22 ++++++++++------------ libjava/configure.ac | 18 ++++++++---------- libjava/gcj/Makefile.in | 1 - libjava/include/Makefile.in | 1 - libjava/testsuite/Makefile.in | 1 - 8 files changed, 37 insertions(+), 36 deletions(-) diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 57f14bd43e3..2408ebffd74 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,18 @@ +2009-03-03 Andrew John Hughes + + * 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 * configure: Regenerate. diff --git a/libjava/Makefile.am b/libjava/Makefile.am index 49685896878..c4746bfd854 100644 --- 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 ## ################################################################ diff --git a/libjava/Makefile.in b/libjava/Makefile.in index c7b22721c7f..4de0b3142c0 100644 --- 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 ' \ diff --git a/libjava/configure b/libjava/configure index 0172312b285..5a7ed17943c 100755 --- a/libjava/configure +++ b/libjava/configure @@ -459,7 +459,7 @@ ac_includes_default="\ #endif" ac_subdirs_all="$ac_subdirs_all classpath libltdl" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os build_libsubdir build_subdir host_subdir target_subdir multi_basedir host host_cpu host_vendor host_os target target_cpu target_vendor target_os target_noncanonical LN_S mkinstalldirs ANTLR_JAR CREATE_GJDOC_TRUE CREATE_GJDOC_FALSE JAVA_MAINTAINER_MODE_TRUE JAVA_MAINTAINER_MODE_FALSE CC ac_ct_CC EXEEXT OBJEXT CXX ac_ct_CXX CFLAGS CXXFLAGS LDFLAGS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE AS ac_ct_AS LD ac_ct_LD AR ac_ct_AR RANLIB ac_ct_RANLIB JAR ZIP UNZIP MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT LIBGCJ_CFLAGS LIBGCJ_CXXFLAGS LIBGCJ_JAVAFLAGS LIBGCJ_LD_SYMBOLIC LIBGCJ_LD_SYMBOLIC_FUNCTIONS LIBGCJDEBUG TOOLKIT XLIB_AWT_TRUE XLIB_AWT_FALSE X_AWT_TRUE X_AWT_FALSE GCJ_FOR_ECJX GCJH host_exeext INCLTDL LIBLTDL DIRLTDL LIBTOOL SED EGREP FGREP GREP DUMPBIN ac_ct_DUMPBIN NM OBJDUMP ac_ct_OBJDUMP lt_ECHO DSYMUTIL ac_ct_DSYMUTIL NMEDIT ac_ct_NMEDIT LIPO ac_ct_LIPO OTOOL ac_ct_OTOOL OTOOL64 ac_ct_OTOOL64 CPP CPPFLAGS CXXCPP GCJ GCJFLAGS GCJDEPMODE am__fastdepGCJ_TRUE am__fastdepGCJ_FALSE subdirs TESTSUBDIR_TRUE TESTSUBDIR_FALSE ECJ_BUILD_JAR ECJ_JAR BUILD_ECJ1_TRUE BUILD_ECJ1_FALSE INSTALL_ECJ_JAR_TRUE INSTALL_ECJ_JAR_FALSE JAVA_HOME_SET_TRUE JAVA_HOME_SET_FALSE JAVA_HOME SUPPRESS_LIBGCJ_BC_TRUE SUPPRESS_LIBGCJ_BC_FALSE BUILD_LIBGCJ_REDUCED_REFLECTION_TRUE BUILD_LIBGCJ_REDUCED_REFLECTION_FALSE INTERPRETER INTERPRETER_TRUE INTERPRETER_FALSE LIBFFI LIBFFIINCS PLATFORM USING_WIN32_PLATFORM_TRUE USING_WIN32_PLATFORM_FALSE USING_POSIX_PLATFORM_TRUE USING_POSIX_PLATFORM_FALSE USING_DARWIN_CRT_TRUE USING_DARWIN_CRT_FALSE SYSTEMSPEC ZLIBSPEC ZLIBTESTSPEC X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS extra_ldflags_libjava extra_gij_ldflags extra_ldflags LIBSTDCXXSPEC LIBGCJTESTSPEC GCLIBS GCINCS GCDEPS GCSPEC JC1GCSPEC GCTESTSPEC USING_BOEHMGC_TRUE USING_BOEHMGC_FALSE USING_NOGC_TRUE USING_NOGC_FALSE THREADLIBS THREADINCS THREADDEPS THREADSPEC THREADSTARTFILESPEC THREADLDFLAGS THREADCXXFLAGS USING_POSIX_THREADS_TRUE USING_POSIX_THREADS_FALSE USING_WIN32_THREADS_TRUE USING_WIN32_THREADS_FALSE USING_NO_THREADS_TRUE USING_NO_THREADS_FALSE USE_LIBGCJ_BC_TRUE USE_LIBGCJ_BC_FALSE LIBGCJ_SPEC HASH_SYNC_SPEC USING_GCC_TRUE USING_GCC_FALSE LIBICONV LTLIBICONV PKG_CONFIG GTK_CFLAGS GTK_LIBS GLIB_CFLAGS GLIB_LIBS LIBART_CFLAGS LIBART_LIBS CLASSPATH_SEPARATOR ZLIBS SYS_ZLIBS ZINCS DIVIDESPEC CHECKREFSPEC EXCEPTIONSPEC BACKTRACESPEC IEEESPEC NATIVE_TRUE NATIVE_FALSE ENABLE_SHARED_TRUE ENABLE_SHARED_FALSE NEEDS_DATA_START_TRUE NEEDS_DATA_START_FALSE INSTALL_BINARIES_TRUE INSTALL_BINARIES_FALSE GCC_UNWIND_INCLUDE toolexecdir toolexecmainlibdir toolexeclibdir GCJVERSION dbexecdir gcjsubdir gxx_include_dir libstdcxx_incdir PERL SYSDEP_SOURCES ANONVERSCRIPT_TRUE ANONVERSCRIPT_FALSE LD_START_STATIC_SPEC LD_FINISH_STATIC_SPEC here python_mod_dir python_mod_dir_expanded MAKE INSTALL_AOT_RPM_TRUE INSTALL_AOT_RPM_FALSE CREATE_JAVA_HOME_TRUE CREATE_JAVA_HOME_FALSE gcc_suffix JAVA_VERSION BUILD_VERSION JVM_ROOT_DIR JVM_JAR_ROOT_DIR JVM_JAR_DIR JRE_DIR SDK_DIR JRE_LNK SDK_LNK SDK_BIN_DIR SDK_LIB_DIR SDK_INCLUDE_DIR JRE_BIN_DIR JRE_LIB_DIR GCJ_BIN_DIR CPU OS LIBDIR LIBOBJS LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os build_libsubdir build_subdir host_subdir target_subdir multi_basedir host host_cpu host_vendor host_os target target_cpu target_vendor target_os target_noncanonical LN_S mkinstalldirs ANTLR_JAR CREATE_GJDOC_TRUE CREATE_GJDOC_FALSE JAVA_MAINTAINER_MODE_TRUE JAVA_MAINTAINER_MODE_FALSE CC ac_ct_CC EXEEXT OBJEXT CXX ac_ct_CXX CFLAGS CXXFLAGS LDFLAGS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE AS ac_ct_AS LD ac_ct_LD AR ac_ct_AR RANLIB ac_ct_RANLIB JAR ZIP UNZIP MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT LIBGCJ_CFLAGS LIBGCJ_CXXFLAGS LIBGCJ_JAVAFLAGS LIBGCJ_LD_SYMBOLIC LIBGCJ_LD_SYMBOLIC_FUNCTIONS LIBGCJDEBUG TOOLKIT XLIB_AWT_TRUE XLIB_AWT_FALSE X_AWT_TRUE X_AWT_FALSE GCJ_FOR_ECJX GCJH host_exeext INCLTDL LIBLTDL DIRLTDL LIBTOOL SED EGREP FGREP GREP DUMPBIN ac_ct_DUMPBIN NM OBJDUMP ac_ct_OBJDUMP lt_ECHO DSYMUTIL ac_ct_DSYMUTIL NMEDIT ac_ct_NMEDIT LIPO ac_ct_LIPO OTOOL ac_ct_OTOOL OTOOL64 ac_ct_OTOOL64 CPP CPPFLAGS CXXCPP GCJ GCJFLAGS GCJDEPMODE am__fastdepGCJ_TRUE am__fastdepGCJ_FALSE subdirs TESTSUBDIR_TRUE TESTSUBDIR_FALSE ECJ_BUILD_JAR ECJ_JAR BUILD_ECJ1_TRUE BUILD_ECJ1_FALSE INSTALL_ECJ_JAR_TRUE INSTALL_ECJ_JAR_FALSE JAVA_HOME_SET_TRUE JAVA_HOME_SET_FALSE JAVA_HOME SUPPRESS_LIBGCJ_BC_TRUE SUPPRESS_LIBGCJ_BC_FALSE BUILD_LIBGCJ_REDUCED_REFLECTION_TRUE BUILD_LIBGCJ_REDUCED_REFLECTION_FALSE INTERPRETER INTERPRETER_TRUE INTERPRETER_FALSE LIBFFI LIBFFIINCS PLATFORM USING_WIN32_PLATFORM_TRUE USING_WIN32_PLATFORM_FALSE USING_POSIX_PLATFORM_TRUE USING_POSIX_PLATFORM_FALSE USING_DARWIN_CRT_TRUE USING_DARWIN_CRT_FALSE SYSTEMSPEC ZLIBSPEC ZLIBTESTSPEC X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS extra_ldflags_libjava extra_gij_ldflags extra_ldflags LIBSTDCXXSPEC LIBGCJTESTSPEC GCLIBS GCINCS GCDEPS GCSPEC JC1GCSPEC GCTESTSPEC USING_BOEHMGC_TRUE USING_BOEHMGC_FALSE USING_NOGC_TRUE USING_NOGC_FALSE THREADLIBS THREADINCS THREADDEPS THREADSPEC THREADSTARTFILESPEC THREADLDFLAGS THREADCXXFLAGS USING_POSIX_THREADS_TRUE USING_POSIX_THREADS_FALSE USING_WIN32_THREADS_TRUE USING_WIN32_THREADS_FALSE USING_NO_THREADS_TRUE USING_NO_THREADS_FALSE USE_LIBGCJ_BC_TRUE USE_LIBGCJ_BC_FALSE LIBGCJ_SPEC HASH_SYNC_SPEC USING_GCC_TRUE USING_GCC_FALSE LIBICONV LTLIBICONV PKG_CONFIG GTK_CFLAGS GTK_LIBS GLIB_CFLAGS GLIB_LIBS LIBART_CFLAGS LIBART_LIBS CLASSPATH_SEPARATOR ZLIBS SYS_ZLIBS ZINCS DIVIDESPEC CHECKREFSPEC EXCEPTIONSPEC BACKTRACESPEC IEEESPEC NATIVE_TRUE NATIVE_FALSE ENABLE_SHARED_TRUE ENABLE_SHARED_FALSE NEEDS_DATA_START_TRUE NEEDS_DATA_START_FALSE INSTALL_BINARIES_TRUE INSTALL_BINARIES_FALSE GCC_UNWIND_INCLUDE toolexecdir toolexecmainlibdir toolexeclibdir GCJVERSION dbexecdir gcjsubdir gxx_include_dir libstdcxx_incdir PERL SYSDEP_SOURCES ANONVERSCRIPT_TRUE ANONVERSCRIPT_FALSE LD_START_STATIC_SPEC LD_FINISH_STATIC_SPEC here python_mod_dir python_mod_dir_expanded MAKE INSTALL_AOT_RPM_TRUE INSTALL_AOT_RPM_FALSE CREATE_JAVA_HOME_TRUE CREATE_JAVA_HOME_FALSE gcc_suffix JAVA_VERSION BUILD_VERSION JVM_ROOT_DIR JVM_JAR_ROOT_DIR JVM_JAR_DIR JRE_DIR JRE_LNK SDK_LNK SDK_BIN_DIR SDK_LIB_DIR SDK_INCLUDE_DIR JRE_BIN_DIR JRE_LIB_DIR GCJ_BIN_DIR CPU OS LIBDIR LIBOBJS LTLIBOBJS' ac_subst_files='' ac_pwd=`pwd` @@ -28198,8 +28198,7 @@ echo "${ECHO_T}JAR root installation directory: ${jvm_jar_dir}" >&6 echo "$as_me:$LINENO: result: Java version: ${JAVA_VERSION}" >&5 echo "${ECHO_T}Java version: ${JAVA_VERSION}" >&6 - 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} @@ -28213,7 +28212,7 @@ echo "${ECHO_T}JVM ROOT directory: ${JVM_ROOT_DIR}" >&6 echo "$as_me:$LINENO: result: JVM JAR ROOT directory: ${JVM_JAR_ROOT_DIR}" >&5 echo "${ECHO_T}JVM JAR ROOT directory: ${JVM_JAR_ROOT_DIR}" >&6 - JVM_JAR_DIR=${jvm_jar_dir}/${sdk_dir} + JVM_JAR_DIR=${jvm_jar_dir} echo "$as_me:$LINENO: result: JVM JAR directory: ${JVM_JAR_DIR}" >&5 echo "${ECHO_T}JVM JAR directory: ${JVM_JAR_DIR}" >&6 @@ -28221,26 +28220,23 @@ echo "${ECHO_T}JVM JAR directory: ${JVM_JAR_DIR}" >&6 JRE_DIR=${jre_dir} - SDK_DIR=${sdk_dir} - - JRE_LNK=${jre_lnk} SDK_LNK=${sdk_lnk} - SDK_BIN_DIR=${jvm_root_dir}/${sdk_dir}/bin + SDK_BIN_DIR=${jvm_root_dir}/bin echo "$as_me:$LINENO: result: SDK tools directory: ${SDK_BIN_DIR}" >&5 echo "${ECHO_T}SDK tools directory: ${SDK_BIN_DIR}" >&6 - SDK_LIB_DIR=${jvm_root_dir}/${sdk_dir}/lib + SDK_LIB_DIR=${jvm_root_dir}/lib echo "$as_me:$LINENO: result: SDK jar directory: ${SDK_LIB_DIR}" >&5 echo "${ECHO_T}SDK jar directory: ${SDK_LIB_DIR}" >&6 - SDK_INCLUDE_DIR=${jvm_root_dir}/${sdk_dir}/include + SDK_INCLUDE_DIR=${jvm_root_dir}/include echo "$as_me:$LINENO: result: SDK include directory: ${SDK_INCLUDE_DIR}" >&5 echo "${ECHO_T}SDK include directory: ${SDK_INCLUDE_DIR}" >&6 @@ -28266,7 +28262,8 @@ echo "${ECHO_T}JRE lib directory: ${JRE_LIB_DIR}" >&6 echo "$as_me:$LINENO: result: GCJ tools directory: ${GCJ_BIN_DIR}" >&5 echo "${ECHO_T}GCJ tools directory: ${GCJ_BIN_DIR}" >&6 - echo host is ${host} + echo "$as_me:$LINENO: result: host is ${host}" >&5 +echo "${ECHO_T}host is ${host}" >&6 if test "x${host_cpu}" = "x" then case ${host} in @@ -28274,6 +28271,8 @@ echo "${ECHO_T}GCJ tools directory: ${GCJ_BIN_DIR}" >&6 host_cpu=x86;; i486-* | i586-* | i686-*) host_cpu=i386;; + x86_64-*) + host_cpu=amd64;; *) host_cpu=${host_cpu};; esac @@ -29925,7 +29924,6 @@ s,@JVM_ROOT_DIR@,$JVM_ROOT_DIR,;t t s,@JVM_JAR_ROOT_DIR@,$JVM_JAR_ROOT_DIR,;t t s,@JVM_JAR_DIR@,$JVM_JAR_DIR,;t t s,@JRE_DIR@,$JRE_DIR,;t t -s,@SDK_DIR@,$SDK_DIR,;t t s,@JRE_LNK@,$JRE_LNK,;t t s,@SDK_LNK@,$SDK_LNK,;t t s,@SDK_BIN_DIR@,$SDK_BIN_DIR,;t t diff --git a/libjava/configure.ac b/libjava/configure.ac index 5d9fd1e849d..2a6b78276fa 100644 --- 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 diff --git a/libjava/gcj/Makefile.in b/libjava/gcj/Makefile.in index e31f3f1d6e3..220f9b056c9 100644 --- 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@ diff --git a/libjava/include/Makefile.in b/libjava/include/Makefile.in index 1b94fcfc571..e262cdab997 100644 --- 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@ diff --git a/libjava/testsuite/Makefile.in b/libjava/testsuite/Makefile.in index 4c3e86c03e1..22a726e5de7 100644 --- 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@ -- 2.30.2