diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2011-08-22 04:55:35 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-08-22 04:55:35 +0200 |
| commit | 23c5e02a837eb148c87cf85309bdba6039022e2a (patch) | |
| tree | b6e8a0fd549e076467e479d1826a5d9be3cb356a /package/openjdk/Makefile | |
| parent | dcbfc98334c615ffd2dd05315a1aef936f65ad46 (diff) | |
unify configure arguments
Diffstat (limited to 'package/openjdk/Makefile')
| -rw-r--r-- | package/openjdk/Makefile | 30 |
1 files changed, 6 insertions, 24 deletions
diff --git a/package/openjdk/Makefile b/package/openjdk/Makefile index 0cdea7b0d..58f54c3ea 100644 --- a/package/openjdk/Makefile +++ b/package/openjdk/Makefile @@ -74,9 +74,7 @@ ifeq ($(ADK_PACKAGE_OPENJDK_CACAO),y) CONFIGURE_BACKEND:= --enable-cacao endif -CONFIGURE_ARGS+= $(CONFIGURE_BACKEND) -CONFIGURE_ARGS+= --disable-docs \ - --disable-bootstrap \ +CONFIGURE_COMMON:= --disable-docs \ --enable-openjdk-cross-compilation \ --with-openjdk-src-dir=$(WRKDIST)/$(PKG_NAME)-$(PKG_VERSION) \ --with-xalan2-jar=${WRKDIST}/${XALAN_NAME}_${XALAN_VERSION}/xalan.jar \ @@ -92,18 +90,16 @@ CONFIGURE_ARGS+= --disable-docs \ --with-gcj=$(STAGING_JAVA_HOST_DIR)/usr/bin/gcj \ --without-rhino +CONFIGURE_ARGS+= $(CONFIGURE_BACKEND) +CONFIGURE_ARGS+= $(CONFIGURE_COMMON) +CONFIGURE_ARGS+= --disable-bootstrap + CONFIGURE_ENV+= PATH=$(STAGING_JAVA_HOST_DIR)/usr/bin:$${PATH}:${STAGING_TARGET_DIR}/usr/bin MAKE_ENV+= ALT_COMPILER_PATH=$(STAGING_HOST_DIR)/$(REAL_GNU_TARGET_NAME) \ ADK_ECJ=$(STAGING_JAVA_HOST_DIR)/usr/bin/ecj \ PATH=$(STAGING_JAVA_HOST_DIR)/usr/bin:$${PATH}:${STAGING_TARGET_DIR}/usr/bin \ GCC_HONOUR_COPTS=s CROSS_COMPILE_ARCH=$(ARCH) \ TARGET_ALIAS=$(GNU_TARGET_NAME) BUILD_ALIAS=$(GNU_HOST_NAME) HOST_ALIAS=$(GNU_TARGET_NAME) - -#OPENJDK_NATIVE_ENV+= ALT_COMPILER_PATH=$(STAGING_HOST_DIR)/$(REAL_GNU_TARGET_NAME) \ - ADK_ECJ=$(STAGING_JAVA_HOST_DIR)/usr/bin/ecj \ - PATH=$(STAGING_JAVA_HOST_DIR)/usr/bin:$${PATH}:${STAGING_TARGET_DIR}/usr/bin \ - GCC_HONOUR_COPTS=s CROSS_COMPILE_ARCH=$(ARCH) \ - TARGET_ALIAS=$(GNU_TARGET_NAME) BUILD_ALIAS=$(GNU_HOST_NAME) HOST_ALIAS=$(GNU_TARGET_NAME) ALL_TARGET:= icedtea # add include path for Xrender.h from staging directory @@ -134,21 +130,7 @@ pre-configure: --localstatedir=/var \ --sysconfdir=/etc \ --enable-bootstrap \ - --enable-openjdk-cross-compilation \ - --with-openjdk-src-dir=$(WRKDIST)/$(PKG_NAME)-$(PKG_VERSION) \ - --with-xalan2-jar=${WRKDIST}/${XALAN_NAME}_${XALAN_VERSION}/xalan.jar \ - --with-xalan2-serializer-jar=${WRKDIST}/${XALAN_NAME}_${XALAN_VERSION}/serializer.jar \ - --with-xerces2-jar=${WRKDIST}/${XALAN_NAME}_${XALAN_VERSION}/xercesImpl.jar \ - --with-jdk-home=$(BOOTSTRAPJDK) \ - --with-java=$(BOOTSTRAPJDK)/bin/java \ - --with-javac=$(BOOTSTRAPJDK)/bin/javac \ - --with-javah=$(BOOTSTRAPJDK)/bin/javah \ - --with-jar=$(BOOTSTRAPJDK)/bin/jar \ - --with-rmic=$(BOOTSTRAPJDK)/bin/rmic \ - --with-native2ascii=$(BOOTSTRAPJDK)/bin/native2ascii \ - --with-gcj=$(STAGING_JAVA_HOST_DIR)/usr/bin/gcj \ - --with-ecj-jar=$(STAGING_JAVA_HOST_DIR)/usr/share/java/ecj.jar \ - --without-rhino ;\ + $(CONFIGURE_COMMON) ;\ env ${MAKE_ENV} $(MAKE) icedtea-ecj # fixup symlinks to bootstrap jdk ln -sf $(BOOTSTRAPJDK)/bin/java $(WRKBUILD)/openjdk.build-ecj/j2sdk-image/bin/java |