diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2011-08-22 08:00:09 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-08-22 08:00:09 +0200 |
| commit | 2a8f18f0aa29136e8d5dce664de031336e531360 (patch) | |
| tree | 510f6fc9a91832ad553e7c7ed130c1826bfd3a39 /package/openjdk | |
| parent | 23c5e02a837eb148c87cf85309bdba6039022e2a (diff) | |
simplify patch, remove unused cruft
Diffstat (limited to 'package/openjdk')
| -rw-r--r-- | package/openjdk/Makefile | 3 | ||||
| -rw-r--r-- | package/openjdk/patches/icedtea6-Makefile_in.patch | 46 |
2 files changed, 1 insertions, 48 deletions
diff --git a/package/openjdk/Makefile b/package/openjdk/Makefile index 58f54c3ea..347f3b01d 100644 --- a/package/openjdk/Makefile +++ b/package/openjdk/Makefile @@ -98,8 +98,7 @@ CONFIGURE_ENV+= PATH=$(STAGING_JAVA_HOST_DIR)/usr/bin:$${PATH}:${STAGING_TARGET 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) + GCC_HONOUR_COPTS=s CROSS_COMPILE_ARCH=$(ARCH) ALL_TARGET:= icedtea # add include path for Xrender.h from staging directory diff --git a/package/openjdk/patches/icedtea6-Makefile_in.patch b/package/openjdk/patches/icedtea6-Makefile_in.patch index 193e008aa..7febd6cac 100644 --- a/package/openjdk/patches/icedtea6-Makefile_in.patch +++ b/package/openjdk/patches/icedtea6-Makefile_in.patch @@ -1,41 +1,5 @@ --- w-openjdk-6-1.orig/icedtea6-1.10/Makefile.in 2011-03-02 20:48:45.000000000 +0100 +++ w-openjdk-6-1/icedtea6-1.10/Makefile.in 2011-04-02 23:33:17.000000000 +0200 -@@ -328,7 +328,7 @@ - am__untar = @am__untar@ - bindir = @bindir@ - build = @build@ --build_alias = @build_alias@ -+build_alias = ${BUILD_ALIAS} - build_cpu = @build_cpu@ - build_os = @build_os@ - build_vendor = @build_vendor@ -@@ -339,7 +339,7 @@ - dvidir = @dvidir@ - exec_prefix = @exec_prefix@ - host = @host@ --host_alias = @host_alias@ -+host_alias = ${HOST_ALIAS} - host_cpu = @host_cpu@ - host_os = @host_os@ - host_vendor = @host_vendor@ -@@ -362,7 +362,7 @@ - sharedstatedir = @sharedstatedir@ - srcdir = @srcdir@ - sysconfdir = @sysconfdir@ --target_alias = @target_alias@ -+target_alias = ${TARGET_ALIAS} - top_build_prefix = @top_build_prefix@ - top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ -@@ -1329,7 +1329,7 @@ stamps/extract-openjdk.stamp: stamps/dow - @OPENJDK_SRC_DIR_FOUND_TRUE@ cp -pPR $(OPENJDK_SRC_DIR_LINK) $(OPENJDK_SRC_DIR) openjdk ; \ - @OPENJDK_SRC_DIR_FOUND_TRUE@ fi - @OPENJDK_SRC_DIR_FOUND_FALSE@@USE_HG_TRUE@ if ! test -d openjdk ; then \ --@OPENJDK_SRC_DIR_FOUND_FALSE@@USE_HG_TRUE@ cp -pPRl openjdk.hg openjdk ; \ -+@OPENJDK_SRC_DIR_FOUND_FALSE@@USE_HG_TRUE@ cp -pPR openjdk.hg openjdk ; \ - @OPENJDK_SRC_DIR_FOUND_FALSE@@USE_HG_TRUE@ fi - @OPENJDK_SRC_DIR_FOUND_FALSE@@USE_HG_FALSE@ set -e ; \ - @OPENJDK_SRC_DIR_FOUND_FALSE@@USE_HG_FALSE@ if ! test -d openjdk ; \ @@ -1576,7 +1576,7 @@ clean-overlay: # FIXME (missing): Rename to clone-ecj. stamps/extract-ecj.stamp: $(OPENJDK_TREE) @@ -66,13 +30,3 @@ touch stamps/native-ecj.stamp clean-native-ecj: -@@ -2167,6 +2167,9 @@ - stamps/jamvm.stamp: $(OPENJDK_TREE) stamps/rt.stamp - @BUILD_JAMVM_TRUE@ cd jamvm/jamvm && \ - @BUILD_JAMVM_TRUE@ ./autogen.sh --with-java-runtime-library=openjdk \ -+@BUILD_JAMVM_TRUE@ --host=$(host_alias) \ -+@BUILD_JAMVM_TRUE@ --build=$(build_alias) \ -+@BUILD_JAMVM_TRUE@ --target=$(target_alias) \ - @BUILD_JAMVM_TRUE@ --prefix=$(abs_top_builddir)/jamvm/install ; \ - @BUILD_JAMVM_TRUE@ $(MAKE) ; \ - @BUILD_JAMVM_TRUE@ $(MAKE) install |