Mercurial > hg > release > icedtea7-2.6

changeset 27:d0d8adc66035

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
2007-06-18 Francis Kung <fkung@redhat.com> * Makefile.am: Apply icedtea-speed patch during fast build. * acinclude.m4: Add fast build option. * configure.ac: Likewise. * patches/icedtea-speed.patch: New file. * Makefile.in: Regenerated. * configure: Likewise.
author Francis Kung <fkung@redhat.com>
date Mon, 18 Jun 2007 17:08:42 -0400
parents d149c2933e63
children 407ec366f7af
files ChangeLog Makefile.am Makefile.in acinclude.m4 configure configure.ac patches/icedtea-speed.patch
diffstat 7 files changed, 125 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Mon Jun 18 13:10:29 2007 -0400
+++ b/ChangeLog	Mon Jun 18 17:08:42 2007 -0400
@@ -1,3 +1,12 @@
+2007-06-18  Francis Kung  <fkung@redhat.com>
+
+	* Makefile.am: Apply icedtea-speed patch during fast build.
+	* acinclude.m4: Add fast build option.
+	* configure.ac: Likewise.
+	* patches/icedtea-speed.patch: New file.
+	* Makefile.in: Regenerated.
+	* configure: Likewise.
+
 2007-06-18  Lillian Angel  <langel@redhat.com>
 
 	* Makefile.am: Removed OPENJDK_SRC_ZIP.
--- a/Makefile.am	Mon Jun 18 13:10:29 2007 -0400
+++ b/Makefile.am	Mon Jun 18 17:08:42 2007 -0400
@@ -15,6 +15,9 @@
 ICEDTEA_ECJ_PATCH = \
 	patches/icedtea-ecj-bootstrap.patch
 
+ICEDTEA_SPEED_PATCH = \
+	patches/icedtea-speed.patch
+
 ICEDTEA_BUILD_DIR = \
 	$(abs_top_srcdir)/openjdk/control/build/linux-$(BUILD_ARCH_DIR)/
 
@@ -222,7 +225,18 @@
 	  else \
 	    : ; \
 	  fi ; \
-	done
+	done ; \
+	if [ -n "$(FAST_BUILD)" ] ; \
+	then \
+	  if $(PATCH) -p0 --dry-run -s -t -f < $(ICEDTEA_SPEED_PATCH) ; \
+	  then \
+	    $(PATCH) -p0 < $(ICEDTEA_SPEED_PATCH) ; \
+	  else \
+	    : ; \
+	  fi ; \
+	else \
+	  : ; \
+	fi
 
 unpatch: unpatchecj
 	for p in $(ICEDTEA_PATCHES) ; \
@@ -233,7 +247,18 @@
 	  else \
 	    : ; \
 	  fi ; \
-	done
+	done ; \
+	if [ -n "$(FAST_BUILD)" ] ; \
+	  then \
+	  if $(PATCH) -p0 -R --dry-run -s -t -f < $(ICEDTEA_SPEED_PATCH) ; \
+	  then \
+	    $(PATCH) -p0 -R < $(ICEDTEA_SPEED_PATCH) ; \
+	  else \
+	    : ; \
+	  fi ; \
+	else \
+	  : ; \
+	fi   
 
 patchecj: patch
 	if $(PATCH) -p0 --dry-run -s -t -f < $(ICEDTEA_ECJ_PATCH) ; \
--- a/Makefile.in	Mon Jun 18 13:10:29 2007 -0400
+++ b/Makefile.in	Mon Jun 18 17:08:42 2007 -0400
@@ -80,6 +80,7 @@
 ECJ_JAR = @ECJ_JAR@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
+FAST_BUILD = @FAST_BUILD@
 FIND = @FIND@
 GREP = @GREP@
 INSTALL = @INSTALL@
@@ -185,6 +186,9 @@
 ICEDTEA_ECJ_PATCH = \
 	patches/icedtea-ecj-bootstrap.patch
 
+ICEDTEA_SPEED_PATCH = \
+	patches/icedtea-speed.patch
+
 ICEDTEA_BUILD_DIR = \
 	$(abs_top_srcdir)/openjdk/control/build/linux-$(BUILD_ARCH_DIR)/
 
@@ -660,7 +664,19 @@
 	  else \
 	    : ; \
 	  fi ; \
-	done
+	done ; \
+	echo $(FAST_BUILD) ; \
+	if [ -n "$(FAST_BUILD)" ] ; \
+	then \
+	  if $(PATCH) -p0 --dry-run -s -t -f < $(ICEDTEA_SPEED_PATCH) ; \
+	  then \
+	    $(PATCH) -p0 < $(ICEDTEA_SPEED_PATCH) ; \
+	  else \
+	    : ; \
+	  fi ; \
+	else \
+	  : ; \
+	fi
 
 unpatch: unpatchecj
 	for p in $(ICEDTEA_PATCHES) ; \
@@ -671,7 +687,18 @@
 	  else \
 	    : ; \
 	  fi ; \
-	done
+	done ; \
+	if [ -n "$(FAST_BUILD)" ] ; \
+	  then \
+	  if $(PATCH) -p0 -R --dry-run -s -t -f < $(ICEDTEA_SPEED_PATCH) ; \
+	  then \
+	    $(PATCH) -p0 -R < $(ICEDTEA_SPEED_PATCH) ; \
+	  else \
+	    : ; \
+	  fi ; \
+	else \
+	  : ; \
+	fi   
 
 patchecj: patch
 	if $(PATCH) -p0 --dry-run -s -t -f < $(ICEDTEA_ECJ_PATCH) ; \
--- a/acinclude.m4	Mon Jun 18 13:10:29 2007 -0400
+++ b/acinclude.m4	Mon Jun 18 17:08:42 2007 -0400
@@ -451,3 +451,15 @@
   AC_CHECK_HEADERS(X11/extensions/Print.h,[],[AC_MSG_ERROR("libXp headers were not found - try installing libXp-devel.")])
   AC_CHECK_HEADERS([Xm/Xm.h Xm/XmP.h Xm/Display.h],[],[AC_MSG_ERROR("motif headers were not found - try installing lesstif-devel.")])
 ])
+
+AC_DEFUN([ENABLE_FAST_BUILD],
+[
+  AC_ARG_ENABLE([fast-build],
+                [AS_HELP_STRING(--enable-fast-build,optimize for quick building: use -O0 and do not build documentation)],
+  [
+    AC_MSG_CHECKING(fast build)
+    FAST_BUILD="${enableval}"
+    AC_MSG_RESULT(${enableval})
+    AC_SUBST(FAST_BUILD)
+  ])
+])
--- a/configure	Mon Jun 18 13:10:29 2007 -0400
+++ b/configure	Mon Jun 18 17:08:42 2007 -0400
@@ -725,6 +725,7 @@
 OPENJDK_SRC_DIR
 GNU_CLASSLIB_FOUND_TRUE
 GNU_CLASSLIB_FOUND_FALSE
+FAST_BUILD
 CPP
 GREP
 EGREP
@@ -1321,6 +1322,8 @@
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
   --disable-dependency-tracking  speeds up one-time build
   --enable-dependency-tracking   do not reject slow dependency extractors
+  --enable-fast-build     optimize for quick building: use -O0 and do not
+                          build documentation
 
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
@@ -5340,6 +5343,20 @@
 
 
 
+  # Check whether --enable-fast-build was given.
+if test "${enable_fast_build+set}" = set; then
+  enableval=$enable_fast_build;
+    { echo "$as_me:$LINENO: checking fast build" >&5
+echo $ECHO_N "checking fast build... $ECHO_C" >&6; }
+    FAST_BUILD="${enableval}"
+    { echo "$as_me:$LINENO: result: ${enableval}" >&5
+echo "${ECHO_T}${enableval}" >&6; }
+
+
+fi
+
+
+
 
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
@@ -7724,6 +7741,7 @@
 OPENJDK_SRC_DIR!$OPENJDK_SRC_DIR$ac_delim
 GNU_CLASSLIB_FOUND_TRUE!$GNU_CLASSLIB_FOUND_TRUE$ac_delim
 GNU_CLASSLIB_FOUND_FALSE!$GNU_CLASSLIB_FOUND_FALSE$ac_delim
+FAST_BUILD!$FAST_BUILD$ac_delim
 CPP!$CPP$ac_delim
 GREP!$GREP$ac_delim
 EGREP!$EGREP$ac_delim
@@ -7731,7 +7749,7 @@
 LTLIBOBJS!$LTLIBOBJS$ac_delim
 _ACEOF
 
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 18; then
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 19; then
     break
   elif $ac_last_try; then
     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
--- a/configure.ac	Mon Jun 18 13:10:29 2007 -0400
+++ b/configure.ac	Mon Jun 18 17:08:42 2007 -0400
@@ -34,6 +34,7 @@
 FIND_XERCES2_JAR
 WITH_OPENJDK_SRC_ZIP
 WITH_OPENJDK_SRC_DIR
+ENABLE_FAST_BUILD
 
 CHECK_HEADERS
 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/icedtea-speed.patch	Mon Jun 18 17:08:42 2007 -0400
@@ -0,0 +1,28 @@
+diff -urN openjdk.orig/j2se/make/common/Defs-linux.gmk openjdk/j2se/make/common/Defs-linux.gmk
+--- openjdk.orig/j2se/make/common/Defs-linux.gmk	2007-05-24 03:33:20.000000000 -0400
++++ openjdk/j2se/make/common/Defs-linux.gmk	2007-06-18 16:02:48.000000000 -0400
+@@ -103,6 +103,7 @@
+     _OPT = $(CC_LOWER_OPT)
+     CPPFLAGS_DBG    += -DLOGGING 
+ endif
++_OPT = -O0
+ 
+ # For all platforms, do not omit the frame pointer register usage. 
+ #    We need this frame pointer to make it easy to walk the stacks.
+diff -urN openjdk.orig/j2se/make/Makefile openjdk/j2se/make/Makefile
+--- openjdk.orig/j2se/make/Makefile	2007-05-24 03:33:16.000000000 -0400
++++ openjdk/j2se/make/Makefile	2007-06-18 16:03:40.000000000 -0400
+@@ -245,9 +245,9 @@
+ #
+ # Docs
+ #
+-OTHERSUBDIRS = docs
+-docs:: sanity-docs post-sanity-docs
+-	$(OTHERSUBDIRS-loop)
++#OTHERSUBDIRS = docs
++#docs:: sanity-docs post-sanity-docs
++#	$(OTHERSUBDIRS-loop)
+ 
+ #
+ # Release engineering targets.
+