Mercurial > hg > release > icedtea6-1.3

changeset 93:be9c65388ba3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
2007-07-14 Thomas Fitzsimmons <fitzsim@redhat.com> * Makefile.am, acinclude.m4, configure.ac: Remove ccache knowledge. * patches/icedtea-ccache.patch: Remove file. * Makefile.in, configure: Regenerate.
author Thomas Fitzsimmons <fitzsim@redhat.com>
date Sat, 14 Jul 2007 22:21:04 -0400
parents 8b04089c1c83
children 88d973cc80fa
files ChangeLog Makefile.am Makefile.in acinclude.m4 configure configure.ac patches/icedtea-ccache.patch
diffstat 7 files changed, 10 insertions(+), 167 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Fri Jul 13 16:05:13 2007 -0400
+++ b/ChangeLog	Sat Jul 14 22:21:04 2007 -0400
@@ -1,3 +1,10 @@
+2007-07-14  Thomas Fitzsimmons  <fitzsim@redhat.com>
+
+	* Makefile.am, acinclude.m4, configure.ac: Remove ccache
+	knowledge.
+	* patches/icedtea-ccache.patch: Remove file.
+	* Makefile.in, configure: Regenerate.
+
 2007-07-13  Lillian Angel  <langel@redhat.com>
 
 	* AUTHORS: Added Mark Wielaard.
--- a/Makefile.am	Fri Jul 13 16:05:13 2007 -0400
+++ b/Makefile.am	Sat Jul 14 22:21:04 2007 -0400
@@ -7,12 +7,6 @@
 
 EXTRA_DIST = rt jce generated $(ICEDTEA_PATCHES) $(ICEDTEA_ECJ_PATCH)
 
-if USE_CCACHE
-  CCACHE_PATCH = patches/icedtea-ccache.patch
-else
-  CCACHE_PATCH = 
-endif
-
 if FAST_BUILD
   FAST_BUILD_PATCH = patches/icedtea-speed.patch
 else
@@ -35,8 +29,7 @@
 	patches/icedtea-ssl.patch \
 	patches/icedtea-buildfix.patch \
 	patches/icedtea-assembler_amd64.patch \
-	$(FAST_BUILD_PATCH) \
-	$(CCACHE_PATCH)
+	$(FAST_BUILD_PATCH)
 
 ICEDTEA_ECJ_PATCH = \
 	patches/icedtea-ecj-bootstrap.patch
--- a/Makefile.in	Fri Jul 13 16:05:13 2007 -0400
+++ b/Makefile.in	Sat Jul 14 22:21:04 2007 -0400
@@ -67,7 +67,6 @@
 AWK = @AWK@
 BUILD_ARCH_DIR = @BUILD_ARCH_DIR@
 CC = @CC@
-CCACHE = @CCACHE@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
@@ -179,8 +178,6 @@
 	http://download.java.net/openjdk/jdk7/promoted/$(OPENJDK_VERSION)/
 
 EXTRA_DIST = rt jce generated $(ICEDTEA_PATCHES) $(ICEDTEA_ECJ_PATCH)
-@USE_CCACHE_FALSE@CCACHE_PATCH = 
-@USE_CCACHE_TRUE@CCACHE_PATCH = patches/icedtea-ccache.patch
 @FAST_BUILD_FALSE@FAST_BUILD_PATCH = 
 @FAST_BUILD_TRUE@FAST_BUILD_PATCH = patches/icedtea-speed.patch
 @USE_ALT_OPENJDK_SRC_ZIP_FALSE@OPENJDK_SRC_ZIP = openjdk-7-ea-src-$(OPENJDK_VERSION)-$(OPENJDK_DATE).zip
@@ -195,8 +192,7 @@
 	patches/icedtea-ssl.patch \
 	patches/icedtea-buildfix.patch \
 	patches/icedtea-assembler_amd64.patch \
-	$(FAST_BUILD_PATCH) \
-	$(CCACHE_PATCH)
+	$(FAST_BUILD_PATCH)
 
 ICEDTEA_ECJ_PATCH = \
 	patches/icedtea-ecj-bootstrap.patch
--- a/acinclude.m4	Fri Jul 13 16:05:13 2007 -0400
+++ b/acinclude.m4	Sat Jul 14 22:21:04 2007 -0400
@@ -510,22 +510,6 @@
   ])
 ])
 
-AC_DEFUN([ENABLE_CCACHE],
-[
-  AC_ARG_ENABLE([ccache],
-                [AS_HELP_STRING(--enable-ccache, use ccache to speed up repeated builds)],
-  [
-    if test "${enableval}" = yes; then
-      AC_CHECK_PROG(CCACHE, ccache, yes)
-    fi;
-  ],
-  [
-      AC_CHECK_PROG(CCACHE, ccache, yes)
-  ])
-
-  AM_CONDITIONAL(USE_CCACHE, test -n "${CCACHE}")
-])
-
 AC_DEFUN([FIND_TOOL],
 [AC_PATH_TOOL([$1],[$2])
  if test x"$$1" = x ; then
--- a/configure	Fri Jul 13 16:05:13 2007 -0400
+++ b/configure	Sat Jul 14 22:21:04 2007 -0400
@@ -729,9 +729,6 @@
 GNU_CLASSLIB_FOUND_FALSE
 FAST_BUILD_TRUE
 FAST_BUILD_FALSE
-CCACHE
-USE_CCACHE_TRUE
-USE_CCACHE_FALSE
 CPP
 GREP
 EGREP
@@ -1330,7 +1327,6 @@
   --enable-dependency-tracking   do not reject slow dependency extractors
   --enable-fast-build     optimize for quick building: use -O0 and do not
                           build documentation
-  --enable-ccache         use ccache to speed up repeated builds
 
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
@@ -5957,102 +5953,6 @@
 
 
 
-  # Check whether --enable-ccache was given.
-if test "${enable_ccache+set}" = set; then
-  enableval=$enable_ccache;
-    if test "${enableval}" = yes; then
-      # Extract the first word of "ccache", so it can be a program name with args.
-set dummy ccache; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_CCACHE+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$CCACHE"; then
-  ac_cv_prog_CCACHE="$CCACHE" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_CCACHE="yes"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-CCACHE=$ac_cv_prog_CCACHE
-if test -n "$CCACHE"; then
-  { echo "$as_me:$LINENO: result: $CCACHE" >&5
-echo "${ECHO_T}$CCACHE" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-
-    fi;
-
-else
-
-      # Extract the first word of "ccache", so it can be a program name with args.
-set dummy ccache; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_CCACHE+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$CCACHE"; then
-  ac_cv_prog_CCACHE="$CCACHE" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_CCACHE="yes"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-CCACHE=$ac_cv_prog_CCACHE
-if test -n "$CCACHE"; then
-  { echo "$as_me:$LINENO: result: $CCACHE" >&5
-echo "${ECHO_T}$CCACHE" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-
-
-fi
-
-
-   if test -n "${CCACHE}"; then
-  USE_CCACHE_TRUE=
-  USE_CCACHE_FALSE='#'
-else
-  USE_CCACHE_TRUE='#'
-  USE_CCACHE_FALSE=
-fi
-
-
-
 
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
@@ -7946,13 +7846,6 @@
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
-if test -z "${USE_CCACHE_TRUE}" && test -z "${USE_CCACHE_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"USE_CCACHE\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"USE_CCACHE\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
 
 : ${CONFIG_STATUS=./config.status}
 ac_clean_files_save=$ac_clean_files
@@ -8625,9 +8518,6 @@
 GNU_CLASSLIB_FOUND_FALSE!$GNU_CLASSLIB_FOUND_FALSE$ac_delim
 FAST_BUILD_TRUE!$FAST_BUILD_TRUE$ac_delim
 FAST_BUILD_FALSE!$FAST_BUILD_FALSE$ac_delim
-CCACHE!$CCACHE$ac_delim
-USE_CCACHE_TRUE!$USE_CCACHE_TRUE$ac_delim
-USE_CCACHE_FALSE!$USE_CCACHE_FALSE$ac_delim
 CPP!$CPP$ac_delim
 GREP!$GREP$ac_delim
 EGREP!$EGREP$ac_delim
@@ -8635,7 +8525,7 @@
 LTLIBOBJS!$LTLIBOBJS$ac_delim
 _ACEOF
 
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 25; then
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 22; then
     break
   elif $ac_last_try; then
     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
--- a/configure.ac	Fri Jul 13 16:05:13 2007 -0400
+++ b/configure.ac	Sat Jul 14 22:21:04 2007 -0400
@@ -34,7 +34,6 @@
 WITH_OPENJDK_SRC_ZIP
 WITH_OPENJDK_SRC_DIR
 ENABLE_FAST_BUILD
-ENABLE_CCACHE
 
 CHECK_HEADERS
 
--- a/patches/icedtea-ccache.patch	Fri Jul 13 16:05:13 2007 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,26 +0,0 @@
---- openjdk/hotspot/build/linux/makefiles/gcc.make	2007-06-20 11:24:49.000000000 -0400
-+++ openjdk/hotspot/build/linux/makefiles/gcc.make	2007-06-20 14:22:48.000000000 -0400
-@@ -25,8 +25,8 @@
- #------------------------------------------------------------------------
- # CC, CPP & AS
- 
--CPP = g++
--CC  = gcc
-+CPP = ccache g++
-+CC  = ccache gcc
- AS  = $(CC) -c
- 
- # -dumpversion in gcc-2.91 shows "egcs-2.91.66". In later version, it only
---- openjdk/j2se/make/common/shared/Compiler-gcc.gmk	2007-06-20 11:24:49.000000000 -0400
-+++ openjdk/j2se/make/common/shared/Compiler-gcc.gmk	2007-06-20 14:39:19.000000000 -0400
-@@ -58,8 +58,8 @@
- ifeq ($(PLATFORM), linux)
- 
-   # Settings specific to Linux
--  CC             = $(COMPILER_PATH)gcc
--  CPP            = $(COMPILER_PATH)gcc -E
-+  CC             = ccache $(COMPILER_PATH)gcc
-+  CPP            = ccache $(COMPILER_PATH)gcc -E
-   # statically link libstdc++ before C++ ABI is stablized on Linux
-   STATIC_CXX     = true
-   ifeq ($(STATIC_CXX),true)