diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2011-04-29 22:11:20 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-04-29 22:11:20 +0200 |
| commit | ef8adeb4778d7dc4f523c97ed18116376ffaad82 (patch) | |
| tree | 3f1345f1d59ef116cfcbf19e943e8575f3dc1bd7 /package/openjdk | |
| parent | 4a2a821ffac90876bd140c357ede04a1c837751c (diff) | |
fix cross-compile from amd64->i586
Diffstat (limited to 'package/openjdk')
| -rw-r--r-- | package/openjdk/Makefile | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/package/openjdk/Makefile b/package/openjdk/Makefile index 916c83bc9..901fcd541 100644 --- a/package/openjdk/Makefile +++ b/package/openjdk/Makefile @@ -138,25 +138,14 @@ pre-configure: --without-rhino ;\ mkdir -p $(WRKBUILD)/generated/sun/awt/X11/generator/ ; \ mkdir -p $(WRKBUILD)/openjdk.build/gensrc/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 ; \ + cp $(TOPDIR)/jtools/openjdk/files/sizes.* $(WRKBUILD)/generated/sun/awt/X11/generator/; \ + cp $(TOPDIR)/jtools/openjdk/files/sizes.* $(WRKBUILD)/openjdk.build/gensrc/sun/awt/X11/generator/; \ $(MAKE) icedtea-ecj # 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 |