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/cross-compile.patch | |
| parent | c29d4fda23a138b713591709ca5ee15c096d467d (diff) | |
| parent | 1260f8dbf14a1b4edd3b7f37cd7b020f88b3a654 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/openjdk/patches/cross-compile.patch')
| -rw-r--r-- | package/openjdk/patches/cross-compile.patch | 56 |
1 files changed, 0 insertions, 56 deletions
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 |