[oe-commits] org.oe.dev swt3.4-gtk_3.3+3.4M3.bb : fix include path problems if JAVA_HOME is set from OM mtn

[xora commit]

swt3.4-gtk_3.3+3.4M3.bb : fix include path problems if JAVA_HOME is set from OM mtn

Author: xora at openembedded.org
Branch: org.openembedded.dev
Revision: c4d53646b7ba4cc5738390ed84a58e60f1679276
ViewMTN: http://monotone.openembedded.org/revision/info/c4d53646b7ba4cc5738390ed84a58e60f1679276
Files:
1
packages/swt/files/make_linux-fix.patch
packages/swt/swt3.4-gtk_3.3+3.4M3.bb
Diffs:

#
# mt diff -rdad501b46df2f2c3f9b2f6546466c10ece7d7381 -rc4d53646b7ba4cc5738390ed84a58e60f1679276
#
#
#
# add_file "packages/swt/files/make_linux-fix.patch"
#  content [c36fcfcc97e0624a3bd9f09d46459a84fc45b283]
# 
# patch "packages/swt/swt3.4-gtk_3.3+3.4M3.bb"
#  from [cf948019bf5ff1d457cbe1999cc6651269b7ea70]
#    to [a779adf603545ff091c4414cb8912b456679c9f6]
#
============================================================
--- packages/swt/files/make_linux-fix.patch	c36fcfcc97e0624a3bd9f09d46459a84fc45b283
+++ packages/swt/files/make_linux-fix.patch	c36fcfcc97e0624a3bd9f09d46459a84fc45b283
@@ -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
============================================================
--- packages/swt/swt3.4-gtk_3.3+3.4M3.bb	cf948019bf5ff1d457cbe1999cc6651269b7ea70
+++ packages/swt/swt3.4-gtk_3.3+3.4M3.bb	a779adf603545ff091c4414cb8912b456679c9f6
@@ -1,7 +1,8 @@ SRC_URI = "http://ftp.wh2.tu-dresden.de/
 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"