From 9ee6fdd5deaccb16f5348ae61f78192f230f2517 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sat, 9 Apr 2011 10:04:12 +0200 Subject: fix g++ usage with a workaround when calling g++ from REAL_GNU_HOSTNAME/bin directory cc1plus cannot be found. May relative path is broken. When copying the binaries to one directory above, it works. Add patches. At least bootstrap target compile begins. --- package/openjdk/Makefile | 3 ++- package/openjdk/patches/debug-javac.patch | 18 ++++++++++++++++++ package/openjdk/patches/disable-freetype-check.patch | 11 +++++++++++ 3 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 package/openjdk/patches/debug-javac.patch create mode 100644 package/openjdk/patches/disable-freetype-check.patch diff --git a/package/openjdk/Makefile b/package/openjdk/Makefile index ca09f50eb..96897bdc8 100644 --- a/package/openjdk/Makefile +++ b/package/openjdk/Makefile @@ -81,7 +81,8 @@ CONFIGURE_ARGS+= --disable-docs \ --with-native2ascii=$(BOOTSTRAPJDK)/bin/native2ascii \ --without-rhino -MAKE_ENV+= ALT_COMPILER_PATH=$(STAGING_HOST_DIR)/usr/$(REAL_GNU_TARGET_NAME)/bin +MAKE_ENV+= ALT_COMPILER_PATH=$(STAGING_HOST_DIR)/$(REAL_GNU_TARGET_NAME) \ + GCC_HONOUR_COPTS=s do-extract: cd ${WRKDIST}; mkdir $(PKG_NAME)-$(PKG_VERSION); \ diff --git a/package/openjdk/patches/debug-javac.patch b/package/openjdk/patches/debug-javac.patch new file mode 100644 index 000000000..f130325ef --- /dev/null +++ b/package/openjdk/patches/debug-javac.patch @@ -0,0 +1,18 @@ +--- w-openjdk-6-1.orig/icedtea6-1.10.orig/javac.in 2011-02-23 23:32:18.635149341 +0100 ++++ w-openjdk-6-1/icedtea6-1.10/javac.in 2011-04-05 16:27:04.291962749 +0200 +@@ -37,6 +37,7 @@ + if ( -e "@abs_top_builddir@/native-ecj" ) + { + my @ecj_args = gen_ecj_opts( \@ARGV ); ++ print 'Using native ecj'; + exec '@abs_top_builddir@/native-ecj', @ecj_parms, @ecj_args ; + } + elsif ( -e "@ECJ_JAR@" ) +@@ -45,6 +46,7 @@ + my @CLASSPATH = ('@ECJ_JAR@'); + push @CLASSPATH, split /:/, $ENV{"CLASSPATH"} if exists $ENV{"CLASSPATH"}; + $ENV{"CLASSPATH"} = join ':', @CLASSPATH; ++ print 'Using ecj with java'; + exec '@JAVA@', 'org.eclipse.jdt.internal.compiler.batch.Main', @ecj_parms, @ecj_args; + } + else diff --git a/package/openjdk/patches/disable-freetype-check.patch b/package/openjdk/patches/disable-freetype-check.patch new file mode 100644 index 000000000..5f5f6cf83 --- /dev/null +++ b/package/openjdk/patches/disable-freetype-check.patch @@ -0,0 +1,11 @@ +--- w-openjdk-6-1.orig/openjdk-6.orig/jdk/make/common/shared/Sanity.gmk 2011-02-28 17:06:10.000000000 +0100 ++++ w-openjdk-6-1/openjdk-6/jdk/make/common/shared/Sanity.gmk 2011-04-05 14:05:29.691807661 +0200 +@@ -793,7 +793,7 @@ + # Check for availability of FreeType (OpenJDK specific) + ###################################################### + +-ifdef OPENJDK ++ifdef OPENJDK_DISABLED + + #name of test program that prints out "Failed" if freetype is not good enough + FREETYPE_VERSION_CHECK_NAME = freetype_versioncheck -- cgit v1.2.3