changeset in /hg/icedtea: 2009-08-06 Matthias Klose <doko at ubun...
doko at ubuntu.com
doko at ubuntu.com
Thu Aug 6 04:35:30 PDT 2009
changeset 2af5ec988144 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=2af5ec988144
description:
2009-08-06 Matthias Klose <doko at ubuntu.com>
* Makefile.am (ICEDTEA_ENV, ICEDTEA_ENV_ECJ): Allow passing
as environment.
diffstat:
2 files changed, 106 insertions(+), 102 deletions(-)
ChangeLog | 5 +
Makefile.am | 203 +++++++++++++++++++++++++++++------------------------------
diffs (262 lines):
diff -r ad8209f846e0 -r 2af5ec988144 ChangeLog
--- a/ChangeLog Thu Aug 06 13:17:23 2009 +0200
+++ b/ChangeLog Thu Aug 06 13:30:06 2009 +0200
@@ -1,3 +1,8 @@ 2009-08-06 Matthias Klose <doko at ubuntu
+2009-08-06 Matthias Klose <doko at ubuntu.com>
+
+ * Makefile.am (ICEDTEA_ENV, ICEDTEA_ENV_ECJ): Allow passing
+ as environment.
+
2009-08-06 Matthias Klose <doko at ubuntu.com>
* Makefile.am (ICEDTEA_PATCHES): Make $(DISTRIBUTION_PATCHES) the
diff -r ad8209f846e0 -r 2af5ec988144 Makefile.am
--- a/Makefile.am Thu Aug 06 13:17:23 2009 +0200
+++ b/Makefile.am Thu Aug 06 13:30:06 2009 +0200
@@ -1532,74 +1532,74 @@ else
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.7.0_$(COMBINED_VERSION)" \
- "MILESTONE=fcs" \
- "LANG=C" \
- "PATH=$(abs_top_builddir)/bootstrap/jdk1.6.0/bin:$(OS_PATH):$$PATH" \
- "ALT_BOOTDIR=$(ICEDTEA_BOOT_DIR)" \
- "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=" \
- "CORE_BUILD=$(ICEDTEA_CORE_BUILD)" \
- "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=" \
- "ANT_RESPECT_JAVA_HOME=TRUE" \
- "RHINO_JAR=$(RHINO_JAR)" \
- "DISTRIBUTION_ID=$(DIST_ID)" \
- "ALT_JIBX_LIBS_PATH=$(JIBX_DEPS_DIR)" \
- "ALT_NETX_DIST=$(abs_top_builddir)/netx.build" \
- "ALT_LIVECONNECT_DIST=$(abs_top_builddir)" \
- "DEBUG_CLASSFILES=true" \
- "DEBUG_BINARIES=true"
+ 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.7.0_$(COMBINED_VERSION)" \
+ MILESTONE="fcs" \
+ LANG="C" \
+ PATH="$(abs_top_builddir)/bootstrap/jdk1.6.0/bin:$(OS_PATH):$$PATH" \
+ ALT_BOOTDIR="$(ICEDTEA_BOOT_DIR)" \
+ 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="" \
+ CORE_BUILD="$(ICEDTEA_CORE_BUILD)" \
+ 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="" \
+ ANT_RESPECT_JAVA_HOME="TRUE" \
+ RHINO_JAR="$(RHINO_JAR)" \
+ DISTRIBUTION_ID="$(DIST_ID)" \
+ ALT_JIBX_LIBS_PATH="$(JIBX_DEPS_DIR)" \
+ ALT_NETX_DIST="$(abs_top_builddir)/netx.build" \
+ ALT_LIVECONNECT_DIST="$(abs_top_builddir)" \
+ DEBUG_CLASSFILES="true" \
+ DEBUG_BINARIES="true"
if WITH_CACAO
ICEDTEA_ENV += \
- "ALT_HOTSPOT_IMPORT_PATH=$(CACAO_IMPORT_PATH)"
+ ALT_HOTSPOT_IMPORT_PATH="$(CACAO_IMPORT_PATH)"
endif
if !ENABLE_NIMBUS_GENERATION
ICEDTEA_ENV += \
- "DISABLE_NIMBUS=true"
+ DISABLE_NIMBUS="true"
endif
if DISABLE_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:
@@ -1612,70 +1612,69 @@ ICEDTEA_CLS_DIR_ECJ = \
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.7.0_$(COMBINED_VERSION)" \
- "MILESTONE=fcs" \
- "LANG=C" \
- "PATH=$(abs_top_builddir)/bootstrap/jdk1.6.0/bin:$(OS_PATH):$$PATH" \
- "ALT_BOOTDIR=$(ICEDTEA_BOOT_DIR)" \
- "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_JDK_DIR)/jre/lib/rt.jar" \
- "CLASSPATH=" \
- "LD_LIBRARY_PATH=" \
- "GENSRCDIR=$(abs_top_builddir)/generated" \
- "CORE_BUILD=$(ICEDTEA_CORE_BUILD)" \
- "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)" \
- "DISABLE_NIMBUS=true" \
- "ALT_NETX_DIST=$(abs_top_builddir)/netx.build" \
- "ALT_LIVECONNECT_DIST=$(abs_top_builddir)" \
- "DEBUG_CLASSFILES=true" \
- "DEBUG_BINARIES=true"
+ 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.7.0_$(COMBINED_VERSION)" \
+ MILESTONE="fcs" \
+ LANG="C" \
+ PATH="$(abs_top_builddir)/bootstrap/jdk1.6.0/bin:$(OS_PATH):$$PATH" \
+ ALT_BOOTDIR="$(ICEDTEA_BOOT_DIR)" \
+ 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_JDK_DIR)/jre/lib/rt.jar" \
+ CLASSPATH="" \
+ LD_LIBRARY_PATH="" \
+ GENSRCDIR="$(abs_top_builddir)/generated" \
+ CORE_BUILD="$(ICEDTEA_CORE_BUILD)" \
+ 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)" \
+ DISABLE_NIMBUS="true" \
+ ALT_NETX_DIST="$(abs_top_builddir)/netx.build" \
+ ALT_LIVECONNECT_DIST="$(abs_top_builddir)" \
+ DEBUG_CLASSFILES="true" \
+ DEBUG_BINARIES="true"
if WITH_CACAO
ICEDTEA_ENV_ECJ += \
- "ALT_HOTSPOT_IMPORT_PATH=$(CACAO_IMPORT_PATH)"
+ ALT_HOTSPOT_IMPORT_PATH="$(CACAO_IMPORT_PATH)"
endif
if DISABLE_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:
More information about the distro-pkg-dev
mailing list