From 876f2127a4bcf6d2b623ce2070e3f082da58e3c5 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Wed, 8 Jan 2014 20:35:03 +0100
Subject: remove openjdk6

---
 package/openjdk/patches/cross-compile.patch | 56 -----------------------------
 1 file changed, 56 deletions(-)
 delete mode 100644 package/openjdk/patches/cross-compile.patch

(limited to 'package/openjdk/patches/cross-compile.patch')

diff --git a/package/openjdk/patches/cross-compile.patch b/package/openjdk/patches/cross-compile.patch
deleted file mode 100644
index 604b5d6cb..000000000
--- a/package/openjdk/patches/cross-compile.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-
- disable wrong pathes to /usr, fix cross-compile
-
---- w-openjdk-6-1.orig/openjdk-6/jdk/make/sun/awt/Makefile	2011-02-28 17:06:11.000000000 +0100
-+++ w-openjdk-6-1/openjdk-6/jdk/make/sun/awt/Makefile	2011-08-07 17:00:37.676468717 +0200
-@@ -509,10 +509,7 @@
- #
- 
- ifeq ($(PLATFORM), linux)
--CPPFLAGS += -I$(MOTIF_DIR)/include \
--            -I$(OPENWIN_HOME)/include \
--            -I$(OPENWIN_HOME)/include/X11/extensions \
--            -I$(PLATFORM_SRC)/native/$(PKGDIR)/font 
-+CPPFLAGS += -I$(PLATFORM_SRC)/native/$(PKGDIR)/font 
- endif
- CPPFLAGS += -I$(SHARE_SRC)/native/$(PKGDIR)/debug \
-             -I$(SHARE_SRC)/native/$(PKGDIR)/../font \
-@@ -535,10 +532,6 @@
-             -I$(PLATFORM_SRC)/native/$(PKGDIR) \
- 	    $(EVENT_MODEL)
- 
--ifeq ($(PLATFORM), linux)
--LDFLAGS += -L$(MOTIF_LIB) -L$(OPENWIN_LIB)
--endif
--
- LDFLAGS += -L$(LIBDIR)/$(LIBARCH)/$(TSOBJDIR) \
- 	   $(AWT_RUNPATH)
- 
---- w-openjdk-6-1.orig/openjdk-6/jdk/make/sun/xawt/Makefile	2011-02-28 17:06:12.000000000 +0100
-+++ w-openjdk-6-1/openjdk-6/jdk/make/sun/xawt/Makefile	2011-08-07 18:31:08.635355054 +0200
-@@ -96,6 +96,10 @@
- 
- CPPFLAGS += -I$(CUPS_HEADERS_PATH)
- 
-+ifeq ($(PLATFORM), linux)
-+CPPFLAGS += -I@ADK_TARGETDIR@/usr/include/X11/extensions
-+endif
-+
- CPPFLAGS += -DXAWT -DXAWT_HACK \
-         -I$(TEMPDIR)/../../sun.awt/awt/CClassHeaders \
-         -I$(PLATFORM_SRC)/native/sun/awt \
-@@ -122,14 +126,6 @@
-         -I$(SHARE_SRC)/native/sun/awt \
-         -I$(PLATFORM_SRC)/native/sun/awt 
- 
--ifeq ($(PLATFORM), linux)
--# Allows for builds on Debian GNU Linux, X11 is in a different place 
--  CPPFLAGS += -I/usr/X11R6/include/X11/extensions \
--              -I/usr/include/X11/extensions \
--              -I$(MOTIF_DIR)/include \
--              -I$(OPENWIN_HOME)/include 
--endif
--
- ifeq ($(PLATFORM), solaris)
-   CPPFLAGS += -I$(OPENWIN_HOME)/include/X11/extensions -I$(MOTIF_DIR)/include 
- endif
-- 
cgit v1.2.3