swt-gtk.inc: Properly give OE's LDFLAGS to makefile.

swt3.3-gtk: Increased PR.
swt3.3-gtk-hildon: Dito.
swt3.4-gtk: Dito.
swt3.4-gtk-hildon: Dito.

diff --git a/recipes/swt/swt-gtk.inc b/recipes/swt/swt-gtk.inc
index eed628a31369c583c922a7b2ce2605a7428f9a78..1c26a397c2aa423d99c93aafcb647bbe80e6a123 100644 (file)
--- a/recipes/swt/swt-gtk.inc
+++ b/recipes/swt/swt-gtk.inc
@@ -22,8 +22,12 @@ do_unpackpost() {
   unzip -o ../src.zip
   cp ../Makefile .
 
+  # Sets version numbers for native libraries.
   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.
+  sed -i -e "s|LIBS = -shared -fPIC|LIBS = -shared ${LDFLAGS}|" make_linux.mak
 }
 
 do_compile() {

diff --git a/recipes/swt/swt3.3-gtk_3.3.1.bb b/recipes/swt/swt3.3-gtk_3.3.1.bb
index 82860edfb31ae7b572d89a3470171891ea887bc5..f6624b3cadde1117466d06d3ccfc8474b5d8f037 100644 (file)
--- a/recipes/swt/swt3.3-gtk_3.3.1.bb
+++ b/recipes/swt/swt3.3-gtk_3.3.1.bb
@@ -1,6 +1,6 @@
 require swt-gtk.inc
 
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "http://ftp-stud.fht-esslingen.de/pub/Mirrors/eclipse/eclipse/downloads/drops/R-${PV}-200710231652/swt-${PV}-gtk-linux-x86.zip \
            file://Makefile"

diff --git a/recipes/swt/swt3.4-gtk-hildon_3.4.2.bb b/recipes/swt/swt3.4-gtk-hildon_3.4.2.bb
index 667e516fa01837c2280a0bf188c1776d20e6017f..d834a58157dbcb97f5e6c4b15e94ef41f0f08576 100644 (file)
--- a/recipes/swt/swt3.4-gtk-hildon_3.4.2.bb
+++ b/recipes/swt/swt3.4-gtk-hildon_3.4.2.bb
@@ -1,6 +1,6 @@
 require swt3.4-gtk_${PV}.bb
 
-PR = "r0"
+PR = "r1"
 
 DEPENDS += "libhildon libhildonfm"
 

diff --git a/recipes/swt/swt3.4-gtk-hildon_3.4.bb b/recipes/swt/swt3.4-gtk-hildon_3.4.bb
index d834a58157dbcb97f5e6c4b15e94ef41f0f08576..ffccd5a339417819d31f035a03855ebd49fe5cd7 100644 (file)
--- a/recipes/swt/swt3.4-gtk-hildon_3.4.bb
+++ b/recipes/swt/swt3.4-gtk-hildon_3.4.bb
@@ -1,6 +1,6 @@
 require swt3.4-gtk_${PV}.bb
 
-PR = "r1"
+PR = "r2"
 
 DEPENDS += "libhildon libhildonfm"
 

diff --git a/recipes/swt/swt3.4-gtk_3.4.2.bb b/recipes/swt/swt3.4-gtk_3.4.2.bb
index f4b6a85f374e4c4a6d53a8540dc7a75c27338d0c..cac36773b54aa7e9cf012d9c595e1c3eb4c8e3b1 100644 (file)
--- a/recipes/swt/swt3.4-gtk_3.4.2.bb
+++ b/recipes/swt/swt3.4-gtk_3.4.2.bb
@@ -1,6 +1,6 @@
 require swt-gtk.inc
 
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "http://ftp.wh2.tu-dresden.de/pub/mirrors/eclipse/eclipse/downloads/drops/R-3.4.2-200902111700/swt-3.4.2-gtk-linux-x86.zip \
            file://Makefile"

diff --git a/recipes/swt/swt3.4-gtk_3.4.bb b/recipes/swt/swt3.4-gtk_3.4.bb
index b6eafcad8cf7e5ee9a0d469c753198664d308d55..c7a534b7add644ab88d9ff2eb31357eef21d723d 100644 (file)
--- a/recipes/swt/swt3.4-gtk_3.4.bb
+++ b/recipes/swt/swt3.4-gtk_3.4.bb
@@ -1,6 +1,6 @@
 require swt-gtk.inc
 
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "http://ftp.wh2.tu-dresden.de/pub/mirrors/eclipse/eclipse/downloads/drops/R-3.4-200806172000/swt-3.4-gtk-linux-x86.zip \
            file://Makefile"