diff options
Diffstat (limited to 'package/openjdk/Makefile')
| -rw-r--r-- | package/openjdk/Makefile | 20 |
1 files changed, 17 insertions, 3 deletions
diff --git a/package/openjdk/Makefile b/package/openjdk/Makefile index d8a932f70..731ecf032 100644 --- a/package/openjdk/Makefile +++ b/package/openjdk/Makefile @@ -89,10 +89,10 @@ CONFIGURE_ARGS+= --disable-docs \ --without-rhino MAKE_ENV+= ALT_COMPILER_PATH=$(STAGING_HOST_DIR)/$(REAL_GNU_TARGET_NAME) \ - GCC_HONOUR_COPTS=s + GCC_HONOUR_COPTS=s CROSS_COMPILE_ARCH=$(ARCH) OPENJDK_NATIVE_ENV+= ALT_COMPILER_PATH=$(STAGING_HOST_DIR)/$(REAL_GNU_TARGET_NAME) \ - GCC_HONOUR_COPTS=s \ + 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 @@ -130,12 +130,26 @@ pre-configure: --with-rmic=$(BOOTSTRAPJDK)/bin/rmic \ --with-native2ascii=$(BOOTSTRAPJDK)/bin/native2ascii \ --without-rhino ;\ + mkdir -p $(WRKBUILD)/generated/sun/awt/X11/generator/ ; \ + cp $(JTOOLS_BUILD_DIR)/icedtea6-1.10/generated/sun/awt/X11/generator/sizes.32 \ + $(WRKBUILD)/generated/sun/awt/X11/generator/sizes.32 ; \ + cp $(JTOOLS_BUILD_DIR)/icedtea6-1.10/generated/sun/awt/X11/generator/sizer.32 \ + $(WRKBUILD)/generated/sun/awt/X11/generator/sizer.32 ; \ + cp $(JTOOLS_BUILD_DIR)/icedtea6-1.10/generated/sun/awt/X11/generator/sizer.32 \ + $(WRKBUILD)/openjdk.build/gensrc/sun/awt/X11/generator/sizer.32 ; \ $(MAKE) icedtea-ecj - # fixup symlinks to bootstrapjdk + # fixup symlinks to bootstrap jdk ln -sf $(BOOTSTRAPJDK)/bin/java $(WRKBUILD)/openjdk.build-ecj/j2sdk-image/bin/java ln -sf $(BOOTSTRAPJDK)/bin/javac $(WRKBUILD)/openjdk.build-ecj/j2sdk-image/bin/javac ln -sf $(BOOTSTRAPJDK)/bin/javah $(WRKBUILD)/openjdk.build-ecj/j2sdk-image/bin/javah ln -sf $(BOOTSTRAPJDK)/bin/jar $(WRKBUILD)/openjdk.build-ecj/j2sdk-image/bin/jar + cp $(JTOOLS_BUILD_DIR)/icedtea6-1.10/generated/sun/awt/X11/generator/sizes.32 \ + $(WRKBUILD)/generated/sun/awt/X11/generator/sizes.32 + cp $(JTOOLS_BUILD_DIR)/icedtea6-1.10/generated/sun/awt/X11/generator/sizer.32 \ + $(WRKBUILD)/generated/sun/awt/X11/generator/sizer.32 + mkdir -p $(WRKBUILD)/openjdk.build/gensrc/sun/awt/X11/generator + cp $(JTOOLS_BUILD_DIR)/icedtea6-1.10/generated/sun/awt/X11/generator/sizer.32 \ + $(WRKBUILD)/openjdk.build/gensrc/sun/awt/X11/generator/sizer.32 openjdk-install: $(INSTALL_DIR) $(IDIR_OPENJDK)/usr |