inc-path.patch 1.2 KB

12345678910111213141516171819202122232425262728293031323334
  1. disable wrong pathes for cross-compilation
  2. --- w-openjdk-6-1.orig/openjdk-6/jdk/make/common/shared/Defs-linux.gmk 2011-02-28 17:06:10.000000000 +0100
  3. +++ w-openjdk-6-1/openjdk-6/jdk/make/common/shared/Defs-linux.gmk 2011-08-08 10:07:58.975256728 +0200
  4. @@ -170,7 +170,7 @@
  5. GCC29_COMPILER_PATH = $(JDK_DEVTOOLS_DIR)/$(PLATFORM)/gcc29/usr/
  6. endif
  7. -_CUPS_HEADERS_PATH=/usr/include
  8. +_CUPS_HEADERS_PATH=/usr/include/disabled
  9. # Import JDK images allow for partial builds, components not built are
  10. # imported (or copied from) these import areas when needed.
  11. --- w-openjdk-6-1.orig/openjdk-6/jdk/make/common/Defs.gmk 2011-02-28 17:06:10.000000000 +0100
  12. +++ w-openjdk-6-1/openjdk-6/jdk/make/common/Defs.gmk 2011-08-10 18:50:53.248017538 +0200
  13. @@ -156,7 +156,7 @@
  14. ifeq ($(DEVTOOLS_FT_DIR_EXISTS), true)
  15. FREETYPE_LIB_PATH = $(DEVTOOLS_FT_DIR)/lib
  16. else
  17. - FREETYPE_LIB_PATH = /usr/lib
  18. + FREETYPE_LIB_PATH = /usr/lib/disabled
  19. USING_SYSTEM_FT_LIB=true
  20. endif
  21. endif
  22. @@ -173,7 +173,7 @@
  23. ifeq ($(DEVTOOLS_FT_DIR_EXISTS), true)
  24. FREETYPE_HEADERS_PATH = $(DEVTOOLS_FT_DIR)/include
  25. else
  26. - FREETYPE_HEADERS_PATH = /usr/include
  27. + FREETYPE_HEADERS_PATH = /usr/include/disabled
  28. endif
  29. endif
  30. endif