swt-gtk.inc: Support SWT 3.6, remove legacy staging support.

swt3.6-gtk 3.6: New recipe.

1 files changed, 6 insertions, 7 deletions

diff --git a/recipes/swt/swt-gtk.inc b/recipes/swt/swt-gtk.inc
index aa0f1ee70e..98565ad446 100644
--- a/recipes/swt/swt-gtk.inc
+++ b/recipes/swt/swt-gtk.inc
@@ -12,6 +12,9 @@ S = "${WORKDIR}/swt-source"
 # in the version.txt file inside the source directory.
 SWT_API_VERSION = ${@bb.fatal('SWT_API_VERSION is not defined in this swt-gtk recipe!')}
 
+# From SWT 3.6 on the link flags can be given via a Makefile parameter.
+EXTRA_OEMAKE = 'SWT_LFLAGS="${LDFLAGS}"'
+
 do_unpackpost() {
   if [ ! -d ${S} ]; then
     mkdir ${S}
@@ -25,16 +28,16 @@ do_unpackpost() {
   sed -i -e "s|RELEASE=OE_SWT_RELEASE|RELEASE=${PV}|" Makefile
   sed -i -e "s|SONAME_VERSION=OE_SWT_API_VERSION|SONAME_VERSION=${SWT_API_VERSION}|" Makefile
 
-  # Properly applies OE's LDFLAGS to linking step.
+  # Properly applies OE's LDFLAGS to linking step (only effective for < SWT 3.6)
   sed -i -e "s|LIBS = -shared -fPIC|LIBS = -shared ${LDFLAGS}|" make_linux.mak
 }
 
+addtask unpackpost after do_unpack before do_patch
+
 do_compile() {
   oe_runmake NATIVE_STATS="-I${STAGING_INCDIR}/classpath"
 }
 
-addtask unpackpost after do_unpack before do_patch
-
 do_install() {
   local swtversion=`cat version.txt | tr -d "version. "`
 
@@ -46,10 +49,6 @@ do_install() {
   oe_libinstall -so libswt-gtk-$swtversion ${D}/${libdir_jni}
 }
 
-do_stage() {
-  oe_jarinstall -s swt-gtk-${PV}.jar swt-gtk.jar swt.jar
-}
-
 PACKAGES += "lib${PN}-jni"
 
 FILES_lib${PN}-jni = "${libdir_jni}/lib*.so*"