diff options
author | Graeme Gregory <dp@xora.org.uk> | 2008-03-20 07:40:13 +0000 |
---|---|---|
committer | Graeme Gregory <dp@xora.org.uk> | 2008-03-20 07:40:13 +0000 |
commit | 612d3778dce93f1932fbbd768989b52950b51198 (patch) | |
tree | d6e7d4a4a9079c88c7f4334a5b4d3746cb3161aa /packages | |
parent | 49c283f8e1d64bffaf6e1a44c4e034f1cc1c6de6 (diff) |
swt3.4-gtk_3.3+3.4M3.bb : fix include path problems if JAVA_HOME is set from OM mtn
Diffstat (limited to 'packages')
-rw-r--r-- | packages/swt/files/make_linux-fix.patch | 22 | ||||
-rw-r--r-- | packages/swt/swt3.4-gtk_3.3+3.4M3.bb | 3 |
2 files changed, 24 insertions, 1 deletions
diff --git a/packages/swt/files/make_linux-fix.patch b/packages/swt/files/make_linux-fix.patch new file mode 100644 index 0000000000..1c98f5cad2 --- /dev/null +++ b/packages/swt/files/make_linux-fix.patch @@ -0,0 +1,22 @@ +Index: swt-source/make_linux.mak +=================================================================== +--- swt-source.orig/make_linux.mak 2008-01-23 15:08:02.000000000 +0800 ++++ swt-source/make_linux.mak 2008-01-23 15:08:21.000000000 +0800 +@@ -74,8 +74,6 @@ + -Wno-non-virtual-dtor \ + -fPIC \ + -I. \ +- -I$(JAVA_HOME)/include \ +- -I$(JAVA_HOME)/include/linux \ + ${SWT_PTR_CFLAGS} + MOZILLALIBS = -shared -Wl,--version-script=mozilla_exports -Bsymbolic + MOZILLAEXCLUDES = -DNO_XPCOMGlueShutdown -DNO_XPCOMGlueStartup +@@ -96,8 +94,6 @@ + -DSWT_VERSION=$(SWT_VERSION) \ + $(NATIVE_STATS) \ + -DLINUX -DGTK \ +- -I$(JAVA_HOME)/include \ +- -I$(JAVA_HOME)/include/linux \ + -fPIC \ + ${SWT_PTR_CFLAGS} + LIBS = -shared -fPIC diff --git a/packages/swt/swt3.4-gtk_3.3+3.4M3.bb b/packages/swt/swt3.4-gtk_3.3+3.4M3.bb index 5d411f1be6..701339d374 100644 --- a/packages/swt/swt3.4-gtk_3.3+3.4M3.bb +++ b/packages/swt/swt3.4-gtk_3.3+3.4M3.bb @@ -1,7 +1,8 @@ require swt-gtk.inc SRC_URI = "http://ftp.wh2.tu-dresden.de/pub/mirrors/eclipse/eclipse/downloads/drops/S-3.4M3-200711012000/swt-3.4M3-gtk-linux-x86.zip \ - file://Makefile" + file://Makefile \ + file://make_linux-fix.patch;patch=1" # A number which is used by SWT to mark the shared libraries. SWTVERSION = "3416" |