blob: 4a195f03e708b451802724f16605743f0a610c36 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
|
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
|
