Mercurial > hg > release > icedtea6-1.5

changeset 1489:d65e58dcaed5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
2009-04-30 Matthias Klose <doko@ubuntu.com> * Makefile.am (ICEDTEA_ENV, ICEDTEA_ENV_ECJ): Allow passing as environment.
author doko@ubuntu.com
date Thu, 30 Apr 2009 14:37:12 +0200
parents 0cf247b95e6c
children 4e5fd2efe6af
files ChangeLog Makefile.am
diffstat 2 files changed, 96 insertions(+), 92 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Wed Apr 29 14:09:02 2009 -0400
+++ b/ChangeLog	Thu Apr 30 14:37:12 2009 +0200
@@ -1,3 +1,8 @@
+2009-04-30  Matthias Klose  <doko@ubuntu.com>
+
+	* Makefile.am (ICEDTEA_ENV, ICEDTEA_ENV_ECJ): Allow passing
+	as environment.
+
 2009-04-29  Omair Majid  <omajid@redhat.com>
 
 	* patches/icedtea-java2d-stroker-internal-close-joint.patch: New patch.
--- a/Makefile.am	Wed Apr 29 14:09:02 2009 -0400
+++ b/Makefile.am	Thu Apr 30 14:37:12 2009 +0200
@@ -136,64 +136,64 @@
   ICEDTEA_SHARK_BUILD =
 endif
 ICEDTEA_ENV = \
-	"ALT_JDK_IMPORT_PATH=$(ICEDTEA_BOOT_DIR)" \
-	"ANT_HOME=$(SYSTEM_ANT_DIR)" \
-        "BUILD_NUMBER=$(OPENJDK_VERSION)" \
-	"JDK_UPDATE_VERSION=$(JDK_UPDATE_VERSION)" \
-        "JRE_RELEASE_VERSION=1.6.0_$(COMBINED_VERSION)" \
-	"MILESTONE=fcs" \
-	"LANG=C" \
-	"PATH=$(abs_top_builddir)/bootstrap/jdk1.6.0/bin:$(OS_PATH):$$PATH" \
-	"ALT_BOOTDIR=$(ICEDTEA_BOOT_DIR)" \
-	"ALT_BINARY_PLUGS_PATH=$(abs_top_builddir)/bootstrap/jdk1.7.0" \
-	"BUILD_ARCH_DIR=$(BUILD_ARCH_DIR)" \
-	"ICEDTEA_RT=$(ICEDTEA_RT)" \
-	"ICEDTEA_BUILD_DIR=$(ICEDTEA_BUILD_DIR)" \
-	"ICEDTEA_CLS_DIR=$(ICEDTEA_CLS_DIR)" \
-	"ICEDTEA_ENDORSED_DIR=$(ICEDTEA_ENDORSED_DIR)" \
-	"ENDORSED=-Djava.endorsed.dirs=$(ICEDTEA_ENDORSED_DIR)" \
-	"CLASSPATH=" \
-	"LD_LIBRARY_PATH=" \
-	"ICEDTEA_CORE_BUILD=$(ICEDTEA_CORE_BUILD)" \
-	"ICEDTEA_ZERO_BUILD=$(ICEDTEA_ZERO_BUILD)" \
-	"ICEDTEA_SHARK_BUILD=$(ICEDTEA_SHARK_BUILD)" \
-	"ZERO_LIBARCH=$(ZERO_LIBARCH)" \
-	"ZERO_BITSPERWORD=$(ZERO_BITSPERWORD)" \
-	"ZERO_ENDIANNESS=$(ZERO_ENDIANNESS)" \
-	"ZERO_ARCHDEF=$(ZERO_ARCHDEF)" \
-	"ZERO_ARCHFLAG=$(ZERO_ARCHFLAG)" \
-	"LIBFFI_CFLAGS=$(LIBFFI_CFLAGS)" \
-	"LIBFFI_LIBS=$(LIBFFI_LIBS)" \
-	"LLVM_CFLAGS=$(LLVM_CFLAGS)" \
-	"LLVM_LDFLAGS=$(LLVM_LDFLAGS)" \
-	"LLVM_LIBS=$(LLVM_LIBS)" \
-	"FREETYPE2_HEADERS=$(FREETYPE2_CFLAGS)" \
-	"FT2_LIB=$(FREETYPE2_LIBS)" \
-	"ALT_PARALLEL_COMPILE_JOBS=$(PARALLEL_JOBS)" \
-	"HOTSPOT_BUILD_JOBS=$(PARALLEL_JOBS)" \
-	"JAVAC=" \
-	"RHINO_JAR=$(RHINO_JAR)" \
-	"DISTRIBUTION_ID=$(DIST_ID)"
+	ALT_JDK_IMPORT_PATH="$(ICEDTEA_BOOT_DIR)" \
+	ANT_HOME="$(SYSTEM_ANT_DIR)" \
+        BUILD_NUMBER="$(OPENJDK_VERSION)" \
+	JDK_UPDATE_VERSION="$(JDK_UPDATE_VERSION)" \
+        JRE_RELEASE_VERSION="1.6.0_$(COMBINED_VERSION)" \
+	MILESTONE="fcs" \
+	LANG="C" \
+	PATH="$(abs_top_builddir)/bootstrap/jdk1.6.0/bin:$(OS_PATH):$$PATH" \
+	ALT_BOOTDIR="$(ICEDTEA_BOOT_DIR)" \
+	ALT_BINARY_PLUGS_PATH="$(abs_top_builddir)/bootstrap/jdk1.7.0" \
+	BUILD_ARCH_DIR="$(BUILD_ARCH_DIR)" \
+	ICEDTEA_RT="$(ICEDTEA_RT)" \
+	ICEDTEA_BUILD_DIR="$(ICEDTEA_BUILD_DIR)" \
+	ICEDTEA_CLS_DIR="$(ICEDTEA_CLS_DIR)" \
+	ICEDTEA_ENDORSED_DIR="$(ICEDTEA_ENDORSED_DIR)" \
+	ENDORSED="-Djava.endorsed.dirs=$(ICEDTEA_ENDORSED_DIR)" \
+	CLASSPATH="" \
+	LD_LIBRARY_PATH="" \
+	ICEDTEA_CORE_BUILD="$(ICEDTEA_CORE_BUILD)" \
+	ICEDTEA_ZERO_BUILD="$(ICEDTEA_ZERO_BUILD)" \
+	ICEDTEA_SHARK_BUILD="$(ICEDTEA_SHARK_BUILD)" \
+	ZERO_LIBARCH="$(ZERO_LIBARCH)" \
+	ZERO_BITSPERWORD="$(ZERO_BITSPERWORD)" \
+	ZERO_ENDIANNESS="$(ZERO_ENDIANNESS)" \
+	ZERO_ARCHDEF="$(ZERO_ARCHDEF)" \
+	ZERO_ARCHFLAG="$(ZERO_ARCHFLAG)" \
+	LIBFFI_CFLAGS="$(LIBFFI_CFLAGS)" \
+	LIBFFI_LIBS="$(LIBFFI_LIBS)" \
+	LLVM_CFLAGS="$(LLVM_CFLAGS)" \
+	LLVM_LDFLAGS="$(LLVM_LDFLAGS)" \
+	LLVM_LIBS="$(LLVM_LIBS)" \
+	FREETYPE2_HEADERS="$(FREETYPE2_CFLAGS)" \
+	FT2_LIB="$(FREETYPE2_LIBS)" \
+	ALT_PARALLEL_COMPILE_JOBS="$(PARALLEL_JOBS)" \
+	HOTSPOT_BUILD_JOBS="$(PARALLEL_JOBS)" \
+	JAVAC="" \
+	RHINO_JAR="$(RHINO_JAR)" \
+	DISTRIBUTION_ID="$(DIST_ID)"
 
 if WITH_CACAO
 ICEDTEA_ENV += \
-	"ALT_HOTSPOT_IMPORT_PATH=$(CACAO_IMPORT_PATH)"
+	ALT_HOTSPOT_IMPORT_PATH="$(CACAO_IMPORT_PATH)"
 endif
 
 if !ENABLE_OPTIMIZATIONS
 ICEDTEA_ENV += \
-	"NO_OPTIMIZATIONS=true" \
-	"CC_NO_OPT=-O0 -g"
+	NO_OPTIMIZATIONS="true" \
+	CC_NO_OPT="-O0 -g"
 endif
 
 if !ENABLE_DOCS
 ICEDTEA_ENV += \
-	"NO_DOCS=true"
+	NO_DOCS="true"
 endif
 
 if USE_ALT_JAR
 ICEDTEA_ENV += \
-	"ALT_JAR_CMD=$(ALT_JAR_CMD)"
+	ALT_JAR_CMD="$(ALT_JAR_CMD)"
 endif
 
 env:
@@ -206,66 +206,65 @@
 ICEDTEA_CLS_DIR_ECJ = \
 	$(abs_top_builddir)/$(ECJ_BUILD_OUTPUT_DIR)/classes
 ICEDTEA_ENV_ECJ = \
-	"ALT_JDK_IMPORT_PATH=$(ICEDTEA_BOOT_DIR)" \
-	"ANT_HOME=$(SYSTEM_ANT_DIR)" \
-	"BUILD_NUMBER=$(OPENJDK_VERSION)" \
-	"JDK_UPDATE_VERSION=$(JDK_UPDATE_VERSION)" \
-        "JRE_RELEASE_VERSION=1.6.0_$(COMBINED_VERSION)" \
-	"MILESTONE=fcs" \
-	"LANG=C" \
-	"PATH=$(abs_top_builddir)/bootstrap/jdk1.6.0/bin:$(OS_PATH):$$PATH" \
-	"ALT_BOOTDIR=$(ICEDTEA_BOOT_DIR)" \
-	"ALT_BINARY_PLUGS_PATH=$(abs_top_builddir)/bootstrap/jdk1.7.0" \
-	"BUILD_ARCH_DIR=$(BUILD_ARCH_DIR)" \
-	"ICEDTEA_RT=$(ICEDTEA_RT)" \
-	"ICEDTEA_BUILD_DIR=$(ICEDTEA_BUILD_DIR_ECJ)" \
-	"ICEDTEA_CLS_DIR=$(ICEDTEA_CLS_DIR_ECJ)" \
-	"ICEDTEA_ENDORSED_DIR=$(ICEDTEA_ENDORSED_DIR)" \
-	"ENDORSED=-Djava.endorsed.dirs=$(ICEDTEA_ENDORSED_DIR)" \
-	"BOOTCLASSPATH_CLS_RT=-bootclasspath \
-	  $(ICEDTEA_CLS_DIR_ECJ):$(ICEDTEA_RT)" \
-	"BOOTCLASSPATH_CLS=-bootclasspath $(ICEDTEA_CLS_DIR_ECJ)" \
-	"BOOTCLASSPATH_RT_LIBGCJ=-bootclasspath $(ICEDTEA_RT):$(SYSTEM_GCJ_DIR)/jre/lib/rt.jar" \
-	"CLASSPATH=" \
-	"LD_LIBRARY_PATH=" \
-	"GENSRCDIR=$(abs_top_builddir)/generated" \
-	"ICEDTEA_CORE_BUILD=$(ICEDTEA_CORE_BUILD)" \
-	"ICEDTEA_ZERO_BUILD=$(ICEDTEA_ZERO_BUILD)" \
-	"ICEDTEA_SHARK_BUILD=$(ICEDTEA_SHARK_BUILD)" \
-	"ZERO_LIBARCH=$(ZERO_LIBARCH)" \
-	"ZERO_BITSPERWORD=$(ZERO_BITSPERWORD)" \
-	"ZERO_ENDIANNESS=$(ZERO_ENDIANNESS)" \
-	"ZERO_ARCHDEF=$(ZERO_ARCHDEF)" \
-	"ZERO_ARCHFLAG=$(ZERO_ARCHFLAG)" \
-	"LIBFFI_CFLAGS=$(LIBFFI_CFLAGS)" \
-	"LIBFFI_LIBS=$(LIBFFI_LIBS)" \
-	"LLVM_CFLAGS=$(LLVM_CFLAGS)" \
-	"LLVM_LDFLAGS=$(LLVM_LDFLAGS)" \
-	"LLVM_LIBS=$(LLVM_LIBS)" \
-	"FREETYPE2_HEADERS=$(FREETYPE2_CFLAGS)" \
-	"FT2_LIB=$(FREETYPE2_LIBS)" \
-	"ALT_PARALLEL_COMPILE_JOBS=$(PARALLEL_JOBS)" \
-	"HOTSPOT_BUILD_JOBS=$(PARALLEL_JOBS)" \
-	"JAVAC=" \
-	"RHINO_JAR=$(RHINO_JAR)" \
-	"JAR_KNOWS_ATFILE=$(JAR_KNOWS_ATFILE)" \
-	"JAR_KNOWS_J_OPTIONS=$(JAR_KNOWS_J_OPTIONS)" \
-	"JAR_ACCEPTS_STDIN_LIST=$(JAR_ACCEPTS_STDIN_LIST)"
+	ALT_JDK_IMPORT_PATH="$(ICEDTEA_BOOT_DIR)" \
+	ANT_HOME="$(SYSTEM_ANT_DIR)" \
+	BUILD_NUMBER="$(OPENJDK_VERSION)" \
+	JDK_UPDATE_VERSION="$(JDK_UPDATE_VERSION)" \
+        JRE_RELEASE_VERSION="1.6.0_$(COMBINED_VERSION)" \
+	MILESTONE="fcs" \
+	LANG=C"" \
+	PATH="$(abs_top_builddir)/bootstrap/jdk1.6.0/bin:$(OS_PATH):$$PATH" \
+	ALT_BOOTDIR="$(ICEDTEA_BOOT_DIR)" \
+	ALT_BINARY_PLUGS_PATH="$(abs_top_builddir)/bootstrap/jdk1.7.0" \
+	BUILD_ARCH_DIR="$(BUILD_ARCH_DIR)" \
+	ICEDTEA_RT="$(ICEDTEA_RT)" \
+	ICEDTEA_BUILD_DIR="$(ICEDTEA_BUILD_DIR_ECJ)" \
+	ICEDTEA_CLS_DIR="$(ICEDTEA_CLS_DIR_ECJ)" \
+	ICEDTEA_ENDORSED_DIR="$(ICEDTEA_ENDORSED_DIR)" \
+	ENDORSED="-Djava.endorsed.dirs=$(ICEDTEA_ENDORSED_DIR)" \
+	BOOTCLASSPATH_CLS_RT="-bootclasspath $(ICEDTEA_CLS_DIR_ECJ):$(ICEDTEA_RT)" \
+	BOOTCLASSPATH_CLS="-bootclasspath $(ICEDTEA_CLS_DIR_ECJ)" \
+	BOOTCLASSPATH_RT_LIBGCJ="-bootclasspath $(ICEDTEA_RT):$(SYSTEM_GCJ_DIR)/jre/lib/rt.jar" \
+	CLASSPATH="" \
+	LD_LIBRARY_PATH="" \
+	GENSRCDIR="$(abs_top_builddir)/generated" \
+	ICEDTEA_CORE_BUILD="$(ICEDTEA_CORE_BUILD)" \
+	ICEDTEA_ZERO_BUILD="$(ICEDTEA_ZERO_BUILD)" \
+	ICEDTEA_SHARK_BUILD="$(ICEDTEA_SHARK_BUILD)" \
+	ZERO_LIBARCH="$(ZERO_LIBARCH)" \
+	ZERO_BITSPERWORD="$(ZERO_BITSPERWORD)" \
+	ZERO_ENDIANNESS="$(ZERO_ENDIANNESS)" \
+	ZERO_ARCHDEF="$(ZERO_ARCHDEF)" \
+	ZERO_ARCHFLAG="$(ZERO_ARCHFLAG)" \
+	LIBFFI_CFLAGS="$(LIBFFI_CFLAGS)" \
+	LIBFFI_LIBS="$(LIBFFI_LIBS)" \
+	LLVM_CFLAGS="$(LLVM_CFLAGS)" \
+	LLVM_LDFLAGS="$(LLVM_LDFLAGS)" \
+	LLVM_LIBS="$(LLVM_LIBS)" \
+	FREETYPE2_HEADERS="$(FREETYPE2_CFLAGS)" \
+	FT2_LIB="$(FREETYPE2_LIBS)" \
+	ALT_PARALLEL_COMPILE_JOBS="$(PARALLEL_JOBS)" \
+	HOTSPOT_BUILD_JOBS="$(PARALLEL_JOBS)" \
+	JAVAC="" \
+	RHINO_JAR="$(RHINO_JAR)" \
+	JAR_KNOWS_ATFILE="$(JAR_KNOWS_ATFILE)" \
+	JAR_KNOWS_J_OPTIONS="$(JAR_KNOWS_J_OPTIONS)" \
+	JAR_ACCEPTS_STDIN_LIST="$(JAR_ACCEPTS_STDIN_LIST)"
 
 if WITH_CACAO
 ICEDTEA_ENV_ECJ += \
-	"ALT_HOTSPOT_IMPORT_PATH=$(CACAO_IMPORT_PATH)"
+	ALT_HOTSPOT_IMPORT_PATH="$(CACAO_IMPORT_PATH)"
 endif
 
 if !ENABLE_OPTIMIZATIONS
 ICEDTEA_ENV_ECJ += \
-	"NO_OPTIMIZATIONS=true" \
-	"CC_NO_OPT=-O0 -g"
+	NO_OPTIMIZATIONS="true" \
+	CC_NO_OPT="-O0 -g"
 endif
 
 if !ENABLE_DOCS
 ICEDTEA_ENV_ECJ += \
-	"NO_DOCS=true"
+	NO_DOCS="true"
 endif
 
 env-ecj: