diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2014-01-08 21:24:00 +0100 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-01-08 21:24:00 +0100 |
commit | 00cbc2bacb89b125b3ed447631cf84e892bb4b77 (patch) | |
tree | 672615fa6be75e9f3262bcb1beafd7a138f425a4 /package/openjdk/patches/inc-path.patch | |
parent | c29d4fda23a138b713591709ca5ee15c096d467d (diff) | |
parent | 1260f8dbf14a1b4edd3b7f37cd7b020f88b3a654 (diff) |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/openjdk/patches/inc-path.patch')
-rw-r--r-- | package/openjdk/patches/inc-path.patch | 34 |
1 files changed, 0 insertions, 34 deletions
diff --git a/package/openjdk/patches/inc-path.patch b/package/openjdk/patches/inc-path.patch deleted file mode 100644 index 4a195f03e..000000000 --- a/package/openjdk/patches/inc-path.patch +++ /dev/null @@ -1,34 +0,0 @@ - - disable wrong pathes for cross-compilation - ---- w-openjdk-6-1.orig/openjdk-6/jdk/make/common/shared/Defs-linux.gmk 2011-02-28 17:06:10.000000000 +0100 -+++ w-openjdk-6-1/openjdk-6/jdk/make/common/shared/Defs-linux.gmk 2011-08-08 10:07:58.975256728 +0200 -@@ -170,7 +170,7 @@ - GCC29_COMPILER_PATH = $(JDK_DEVTOOLS_DIR)/$(PLATFORM)/gcc29/usr/ - endif - --_CUPS_HEADERS_PATH=/usr/include -+_CUPS_HEADERS_PATH=/usr/include/disabled - - # Import JDK images allow for partial builds, components not built are - # imported (or copied from) these import areas when needed. ---- w-openjdk-6-1.orig/openjdk-6/jdk/make/common/Defs.gmk 2011-02-28 17:06:10.000000000 +0100 -+++ w-openjdk-6-1/openjdk-6/jdk/make/common/Defs.gmk 2011-08-10 18:50:53.248017538 +0200 -@@ -156,7 +156,7 @@ - ifeq ($(DEVTOOLS_FT_DIR_EXISTS), true) - FREETYPE_LIB_PATH = $(DEVTOOLS_FT_DIR)/lib - else -- FREETYPE_LIB_PATH = /usr/lib -+ FREETYPE_LIB_PATH = /usr/lib/disabled - USING_SYSTEM_FT_LIB=true - endif - endif -@@ -173,7 +173,7 @@ - ifeq ($(DEVTOOLS_FT_DIR_EXISTS), true) - FREETYPE_HEADERS_PATH = $(DEVTOOLS_FT_DIR)/include - else -- FREETYPE_HEADERS_PATH = /usr/include -+ FREETYPE_HEADERS_PATH = /usr/include/disabled - endif - endif - endif |